aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslomo <steve.harrison@gmx.net>2011-01-21 17:14:50 +0100
committerslomo <steve.harrison@gmx.net>2011-01-21 17:14:50 +0100
commite96cfc0d2262596694ad5f07722ec1a856060b7a (patch)
tree79b17b4d26a3cd29db957ad7140da5084466d098
parent6eec9b54163d02f49a817d71484bc8f431a81881 (diff)
downloadosm-xapi-e96cfc0d2262596694ad5f07722ec1a856060b7a.tar.gz
osm-xapi-e96cfc0d2262596694ad5f07722ec1a856060b7a.tar.xz
osm-xapi-e96cfc0d2262596694ad5f07722ec1a856060b7a.zip
fixed confilicts
-rw-r--r--src/nodejs/no1.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nodejs/no1.js b/src/nodejs/no1.js
index d51a19b..64e0593 100644
--- a/src/nodejs/no1.js
+++ b/src/nodejs/no1.js
@@ -20,7 +20,10 @@ var connectionString = config['connectionString'];
var log4js = require('log4js')(); //note the need to call the function
//log4js.addAppender(log4js.fileAppender('osm-xapi.log'), 'cheese');
-var log.= log4js.getlog.'global');
+var util = require('util');
+
+
+var log = log4js.getLogger('global');
log.setLevel('ALL');
log.info("server starting...");