Merge branch '0.7' of github.com:Flotype/now into 0.7

Flotype · Jul 8, 2011 · 3543f45 · 3543f45
2 parents e57797a + 690c380
commit 3543f45
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/lib/function.js b/lib/function.js
@@ -16,7 +16,7 @@ exports.init = function (now) {
         if (typeof args[i] === 'function') {
           closureId = 'closure_' + args[i].name + '_' + nowUtil.generateRandomString();
           now.closures[closureId] = args[i];
-          args[i] = {closure: closureId};
+          args[i] = {fqn: closureId};
           setTimeout(function () {
             now.closures[closureId] = nowUtil.noop;
           }, now.options.closureTimeout);

diff --git a/lib/now.js b/lib/now.js
@@ -61,4 +61,8 @@ Now.prototype.initialize = function (server, options) {
   return everyone;
 };
 
-exports.Now = Now;
+process.on('uncaughtException', function (err) {
+  nowUtil.error(err);
+});
+
+exports.Now = Now;
diff --git a/lib/nowUtil.js b/lib/nowUtil.js
@@ -17,6 +17,13 @@ var util = {
     return Math.random().toString().substr(2);
   },
 
+  error: function(err){
+    console.log(err);
+    if(nowUtil.hasProperty(err, 'stack')){
+      console.log(err.stack);
+    }
+  },
+
   getAllChildFqns: function (parentObj, parentFqn) {
     var fqns = [];
 
@@ -70,7 +77,7 @@ var util = {
       return val;
     }
   },
-  
+
   isEmptyObj: function(obj){
     for (var i in obj) {
       return false;

diff --git a/lib/user.js b/lib/user.js
@@ -11,7 +11,12 @@ exports.initialize = function (now) {
 
     // Remote function call handler
     socket.on('rfc', function rfcHandler(data) {
-      var theFunction = self.get(data.fqn);
+      var theFunction;
+      if(data.fqn.split("_")[0] === 'closure'){
+        theFunction = now.closures[data.fqn];
+      } else {
+        theFunction = self.get(data.fqn);
+      }
       var args = data.args;
       // Convert any remote function stubs into remote functions
       var user;

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "node": ">= v0.4.0"
   },
   "dependencies": {
-    "socket.io": "0.7.2",
+    "socket.io": ">= 0.7.2",
     "node-proxy": "0.4.0"
 },
   "devDependencies": {}