From ffca6961fd69daf7d700549e0f310b539826b2fa Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@timjrobinson.com>
Date: Wed, 23 Mar 2016 19:02:05 +0000
Subject: [PATCH] Add callback to log function. Fix logging

---
 configs/client-default.js            | 1 +
 plugins/c9.vfs.client/log-service.js | 8 ++++----
 plugins/c9.vfs.client/vfs.log.js     | 7 ++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index 7756c0fc..d903032d 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -109,6 +109,7 @@ module.exports = function(options) {
         
         // VFS
         "plugins/c9.vfs.client/vfs.ping",
+        "plugins/c9.vfs.client/vfs.log",
         {
             packagePath: "plugins/c9.vfs.client/vfs_client",
             debug: debug,
diff --git a/plugins/c9.vfs.client/log-service.js b/plugins/c9.vfs.client/log-service.js
index 0b503eff..44ec4475 100644
--- a/plugins/c9.vfs.client/log-service.js
+++ b/plugins/c9.vfs.client/log-service.js
@@ -1,9 +1,9 @@
-
 module.exports = function(vfs, options, register) {
     register(null, {
-        log: function(message, callback) {
-            console.log("VFSLOG: " + message);
-            console.error("VFSERROR: " + message);
+        log: function (message, callback) {
+            callback = callback || function(){};
+            
+            console.log(message);
             callback();
         }
     })
diff --git a/plugins/c9.vfs.client/vfs.log.js b/plugins/c9.vfs.client/vfs.log.js
index e515a690..3d3c453a 100644
--- a/plugins/c9.vfs.client/vfs.log.js
+++ b/plugins/c9.vfs.client/vfs.log.js
@@ -44,8 +44,13 @@ define(function (require, exports, module) {
         
         function log() {
             if (!server) return console.error("Cannot log, client is offline");
+            var callback = function(){};
             
             var args = Array.prototype.slice.call(arguments);
+            if (typeof args[args.length-1] === "function") {
+                callback = args.splice(args.length-1, 1);
+            }
+            
             var message = "";
             args.forEach(function (arg) {
                 if (typeof arg === "object") {
@@ -54,7 +59,7 @@ define(function (require, exports, module) {
                 message += arg;
             });
                 
-            server.log(message);
+            server.log(message, callback);
         }
         
         plugin.on("load", function() {