aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Engel <mark.c.engel@gmail.com>2011-01-21 20:00:50 +0100
committerMark Engel <mark.c.engel@gmail.com>2011-01-21 20:00:50 +0100
commit3b2e7507b0ef20e3f05e458bc7465c6a5511e694 (patch)
treec7dd373c4def80dba664a04afbe358d31488aa27
parent8f3aaad7210274d49af81b504cb7fc81158e830a (diff)
parent07da9786719a93a019288367438aa9131af8a8e0 (diff)
downloadosm-xapi-3b2e7507b0ef20e3f05e458bc7465c6a5511e694.tar.gz
osm-xapi-3b2e7507b0ef20e3f05e458bc7465c6a5511e694.tar.xz
osm-xapi-3b2e7507b0ef20e3f05e458bc7465c6a5511e694.zip
Merge branch 'master' of github.com:slomo/osm-spline-xapi
Conflicts: src/nodejs/main.js
-rw-r--r--src/nodejs/config.json1
-rw-r--r--src/nodejs/xmlGenerator.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nodejs/config.json b/src/nodejs/config.json
index 9c18203..be796a7 100644
--- a/src/nodejs/config.json
+++ b/src/nodejs/config.json
@@ -1,3 +1,4 @@
exports.connectionString = "pg://user:password@host/database";
exports.host = 'localhost';
exports.port = 8080;
+exports.logLevel = 'ERROR';
diff --git a/src/nodejs/xmlGenerator.js b/src/nodejs/xmlGenerator.js
index 5dc0efa..17143a8 100644
--- a/src/nodejs/xmlGenerator.js
+++ b/src/nodejs/xmlGenerator.js
@@ -1,10 +1,12 @@
+var config = require('./config.json');
+
var builder = require('xmlbuilder');
//set up logger
var log4js = require('log4js')(); //note the need to call the function
//log4js.addAppender(log4js.fileAppender('osm-xapi.log'), 'cheese');
var log = log4js.getLogger('xmlGenerator');
-log.setLevel('ALL');
+log.setLevel(config.logLevel);
exports.createNode = function (row) {