middle-initialize callback with logging level

Author: Gabriel Hopper

Diff for: LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 jolira
+Copyright (c) 2013
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation the

Diff for: index.js

@@ -53,12 +53,7 @@
         defaults.htmlFiles = [
             path.join(templates, "container.html")
         ];
-//        [
-//            "img/glyphicons-halflings.png",
-//            "img/glyphicons-halflings-white.png"
-//        ].forEach(function (file) {
-//                defaults.manifest.push(file);
-//            });
+
         defaults.links.push({
             rel:"apple-touch-startup-image",
             href:"startup.png"

Diff for: lib/client-init.js

@@ -4,9 +4,19 @@
 
     module.exports = function(logger) {
         return {
-            'middle-initialize':function (id) {
+            'middle-initialize':function (id, cb) {
                 this.set("id", id);
                 logger.info("initialized", this.id, id);
+
+//                logger[level]
+                var loggingLevel = 'debug';
+                if(process.env.NODE_ENV === "production") {
+                    loggingLevel = 'error';
+                }
+                if(cb) {
+                    cb(undefined, {loggingLevel: loggingLevel});
+                }
+
             }
         };
     };

Diff for: lib/client-logger.js

@@ -30,7 +30,6 @@
                     var params = convert(client.id, id, args),
                         level = params.shift(),
                         _logger = logger[level] || logger.info;
-
                     return _logger.apply(_logger, params);
                 });
             }

Diff for: public/js/app-middle.js

@@ -28,21 +28,31 @@
         }
     }
 
-    function log(socket, level, _args) {
-        var args = Array.prototype.slice.call(_args),
-            params = [
-                "log",
-                level,
-                new Date()
-            ];
-
-        _.each(args, function (arg) {
-            var param = convert(arg);
-
-            params.push(param);
-        });
+    function log(socket, level, loggingLevel, _args) {
+
+        var logToServer = false;
+        if('error' === loggingLevel === level) {
+            logToServer = true;
+        } else if ('debug' === loggingLevel) {
+            logToServer = true;
+        }
+
+        if(logToServer) {
+            var args = Array.prototype.slice.call(_args),
+                params = [
+                    "log",
+                    level,
+                    new Date()
+                ];
+
+            _.each(args, function (arg) {
+                var param = convert(arg);
+
+                params.push(param);
+            });
 
-        return socket.emit.apply(socket, params);
+            return socket.emit.apply(socket, params);
+        }
     }
 
     function emitter(socket) {
@@ -116,21 +126,23 @@
                     platform:device.platform,
                     version:device.version,
                     cordova:device.cordova
-                });
+                }, function(err, result) {
+                    app.log = function () {
+                        return log(socket, "info", result.loggingLevel, arguments);
+                    };
+                    app.debug = function () {
+                        return log(socket, "debug", result.loggingLevel, arguments);
+                    };
+                    app.error = function () {
+                        return log(socket, "error", result.loggingLevel, arguments);
+                    };
+
+                    app.log("middle connected");
 
-                app.log = function () {
-                    return log(socket, "info", arguments);
-                };
-                app.debug = function () {
-                    return log(socket, "debug", arguments);
-                };
-                app.error = function () {
-                    return log(socket, "error", arguments);
-                };
+                    return _cb && _cb(socket);
+                });
 
-                app.log("middle connected");
 
-                return _cb && _cb(socket);
             });
             socket.on('disconnect', function () {
                 app.middle.connected = false;