Merge pull request #1 from gustavovaliati/master

Fixed the app to work with new version of socket.io package.
CELTAB · Sep 24, 2014 · a109d89 · a109d89
2 parents 023ad87 + 560e364
commit a109d89
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 71 deletions.
diff --git a/app.js b/app.js
@@ -35,7 +35,7 @@ var express = require('express')
 // Socket.io
 var http = require('http');
 var server = http.createServer(app);
-var io = require('socket.io').listen(server);
+var io = require('socket.io').listen(server, {log: false});
 
 MongoClient.connect('mongodb://localhost:27017/rfidmonitor', function(err, db) {
     "use strict";
@@ -60,10 +60,7 @@ MongoClient.connect('mongodb://localhost:27017/rfidmonitor', function(err, db) {
     if ('development' == app.get('env')) {
       app.use(express.logger('dev'));
       app.locals.pretty = true;
-
-      io.configure('development', function () {
-        io.disable('log');
-      });
+
     }
 
     // Application routes

diff --git a/fakecollector_and_dump/dump/rfidmonitor/collectors.bson b/fakecollector_and_dump/dump/rfidmonitor/collectors.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/collectors.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/collectors.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/images.bson b/fakecollector_and_dump/dump/rfidmonitor/images.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/images.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/images.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/institutions.bson b/fakecollector_and_dump/dump/rfidmonitor/institutions.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/institutions.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/institutions.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/rfiddatas.bson b/fakecollector_and_dump/dump/rfidmonitor/rfiddatas.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/rfiddatas.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/rfiddatas.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/sessions.bson b/fakecollector_and_dump/dump/rfidmonitor/sessions.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/sessions.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/sessions.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/species.bson b/fakecollector_and_dump/dump/rfidmonitor/species.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/species.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/species.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/system.indexes.bson b/fakecollector_and_dump/dump/rfidmonitor/system.indexes.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/tagged_fishes.bson b/fakecollector_and_dump/dump/rfidmonitor/tagged_fishes.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/tagged_fishes.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/tagged_fishes.metadata.json
diff --git a/fakecollector_and_dump/dump/rfidmonitor/users.bson b/fakecollector_and_dump/dump/rfidmonitor/users.bson
diff --git a/fakecollector_and_dump/dump/rfidmonitor/users.metadata.json b/fakecollector_and_dump/dump/rfidmonitor/users.metadata.json
diff --git a/fakecollector_and_dump/fake_collector.sh b/fakecollector_and_dump/fake_collector.sh
diff --git a/fakecollector_and_dump/netcat_stream.txt b/fakecollector_and_dump/netcat_stream.txt
diff --git a/package.json b/package.json
@@ -8,10 +8,10 @@
     "consolidate": "~0.9.1",
     "express": "~3.0",
     "mongodb": "~1.3.9",
-    "jade": "*",
+    "jade": "1.7.0",
     "validator": "~1.1.3",
-    "socket.io": "*",
-    "json2csv": "*"
+    "socket.io": "1.1.0",
+    "json2csv": "2.2.1"
   },
   "repository": "",
   "author": "Luis Valdes <[email protected]>",