Skip to content

Commit

Permalink
0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ChriD committed Jan 13, 2018
1 parent 29eb2a9 commit cd9dd09
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
3 changes: 2 additions & 1 deletion config/default.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"raumserver": {
"port" : 8080
"port" : 8080,
"loglevel" : 2 // 0=error, 1=warnings, 2=info, 3=verbose, 4=debug, 5=silly
},
"raumfeld": {
"raumfeldHost" : "0.0.0.0", // 0.0.0.0 = autodetect
Expand Down
4 changes: 2 additions & 2 deletions lib/lib.raumserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ module.exports = class Raumserver extends Raumkernel.Base

// set some other settings from the config/settings file
// TODO: @@@
//this.raumkernel.getSettings().
//this.raumkernel.getSettings().

// if there is no logger defined we do create a standard logger
if(!this.parmLogger())
this.createLogger();
this.createLogger(this.settings.loglevel);

// Do the init of the raumkernel. This will include starting for the raumfeld multiroom system and we
// do hook up on some events so the raumserver knows the status of the multiroom system
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"node": ">=7.6.0"
},
"name": "node-raumserver",
"version": "0.0.10",
"version": "0.1.1",
"description": "Server to control the Raumfeld multiroom system via requests",
"main": "index.js",
"scripts": {
Expand All @@ -20,7 +20,7 @@
],
"dependencies": {
"config": "^1.25.1",
"node-raumkernel": "^1.1.8"
"node-raumkernel": "^1.2.0"
},
"author": "Christian Dürnberger",
"bugs": {
Expand Down
3 changes: 2 additions & 1 deletion raumserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var Raumserver = require('./lib/lib.raumserver');
var raumserver = new Raumserver();

setConfiguration("raumserver", "port");
setConfiguration("raumserver", "loglevel");
setConfiguration("raumfeld", "raumfeldHost");
setConfiguration("raumfeld", "raumfeldHostRequestPort");
setConfiguration("raumfeld", "raumfeldManufacturerId");
Expand All @@ -17,7 +18,7 @@ setConfiguration("raumfeld", "rendererStateTriggerConfirmationTimout");
setConfiguration("raumfeld", "zoneTriggerConfirmationTimout");


raumserver.createLogger(4);
//raumserver.createLogger(4);
raumserver.init();


Expand Down

0 comments on commit cd9dd09

Please sign in to comment.