Skip to content

Commit

Permalink
json config
Browse files Browse the repository at this point in the history
  • Loading branch information
julianbrowne committed Jul 22, 2014
1 parent 042f8ad commit a334230
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 23 deletions.
31 changes: 31 additions & 0 deletions config/rtsdemo.json
@@ -0,0 +1,31 @@
{
"mongodb": {
"home": "/usr/local/mongodb-2.4.4",
"single": {
"host": "localhost",
"port": 27017,
"db": "rtsdemo",
"collection": "statstore"
},
"repset": {
"host": "localhost",
"name": "rtsdemo",
"ports": [ 8002, 8003 ],
"db": "local",
"collection": "oplog.rs"
}
},

"http": {
"port": 8010
},

"watchers": {
"single": {
"websocket": 8011
},
"repset": {
"websocket": 8012
}
}
}
1 change: 0 additions & 1 deletion rswatcher.js
Expand Up @@ -7,7 +7,6 @@
var http = require('http');
var socket = require('socket.io');
var mongo = require('mongodb');
require('./lib/cursorextension.js').extendCursor(mongo);
var utils = require('./lib/utils.js');

// mongo/demo settings
Expand Down
6 changes: 3 additions & 3 deletions server.js
Expand Up @@ -4,7 +4,7 @@

var http = require('http');
var content = require('node-static');
var demoPort = 8010;
var config = require('./config/rtsdemo.json');

var www = new(content.Server)('public');

Expand All @@ -21,6 +21,6 @@ var handler = function (request, response) {
};

var server = http.createServer(handler);
server.listen(demoPort);
server.listen(config.http.port);

console.log("RTS Demo: Server running on http://localhost:%s", demoPort);
console.log("RTS Demo: Server running on http://localhost:%s", config.http.port);
25 changes: 6 additions & 19 deletions sswatcher.js
@@ -1,38 +1,25 @@
/**
*
* RTS Demo - Single Mongo Server Watcher
*
**/

var http = require('http');
var socket = require('socket.io');
var mongo = require('mongodb');
require('./lib/cursorextension.js').extendCursor(mongo);
var utils = require('./lib/utils.js');

// mongo/demo settings

var mongoHost = 'localhost';
var mongoPort = 27017;
var dbname = 'rtsdemo';
var collname = 'statstore';

var wsPort = 8011;

// start socket server
var config = require('./config/rtsdemo.json');

var socketsApp = http.createServer();
var io = socket.listen(socketsApp);
io.set('log level', 1);
socketsApp.listen(wsPort);
socketsApp.listen(config.watchers.single.websocket);

console.log("RTS Demo: SS Watcher WS server running on ws://localhost:" + wsPort);
console.log("RTS Demo: SS Watcher WS server running on ws://localhost:%s", config.watchers.single.websocket);

// create mongo connection and make a db

var mongoServer = new mongo.Server(mongoHost, mongoPort, {});
var mongoServer = new mongo.Server(config.mongodb.single.host, config.mongodb.single.port, {});

var dbConnection = new mongo.Db(dbname, mongoServer, {});
var dbConnection = new mongo.Db(config.mongodb.single.db, mongoServer, {});

// Open db and wait for browser to connect

Expand All @@ -44,7 +31,7 @@ dbConnection.open(function(error,db){
process.exit(1);
}

var coll = db.collection(collname);
var coll = db.collection(config.mongodb.single.collection);

io.sockets.on('connection', function (socket) {
console.log('RTS Demo: Received browser connection.');
Expand Down

0 comments on commit a334230

Please sign in to comment.