Merge origin/master

Author: ChristophBodenstein

TOEDistributionServer/src/node/tns/app.js

@@ -12,12 +12,11 @@ var fs = require('fs');
 //Add database
 var mongo = require('mongoskin');
 var db = mongo.db('mongodb://localhost:27017/tnsnode',{native_parser:true});
-
+global.db=db;
 //Drop old collection
 //db.('simlist').drop();
 
 var routes = require('./routes/index');
-var users = require('./routes/users');
 
 var app = express();
 
@@ -39,7 +38,6 @@ app.use(function(req,res, next){
 });
 
 app.use('/', routes);
-app.use('/users', users);
 app.use('/timenetws-server',routes);
 
 

TOEDistributionServer/src/node/tns/mongoconfig.conf

@@ -3,5 +3,6 @@ port = 27017
 quiet = true
 dbpath = data
 #logappend = true
-logpath = ./mongod.log
+#logpath = ./mongod.log
+logpath = /dev/null
 nojournal = true