merging javascript branch

1 files changed, 39 insertions, 0 deletions

diff --git a/js/src/Ice/ProcessLogger.js b/js/src/Ice/ProcessLogger.js
new file mode 100644
index 00000000000..b414d183adc
--- /dev/null
+++ b/js/src/Ice/ProcessLogger.js
@@ -0,0 +1,39 @@
+
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+(function(global){
+    require("Ice/Logger");
+    var Ice = global.Ice || {};
+    var Logger = Ice.Logger;
+    
+    var processLogger = null;
+    
+    var getProcessLogger = function()
+    {
+        if(processLogger === null)
+        {
+            //
+            // TODO: Would be nice to be able to use process name as prefix by default.
+            //
+            processLogger = new Logger("", "");
+        }
+
+        return processLogger;
+    };
+
+    var setProcessLogger = function(logger)
+    {
+        processLogger = logger;
+    };
+
+    Ice.getProcessLogger = getProcessLogger;
+    Ice.setProcessLogger = setProcessLogger;
+    global.Ice = Ice;
+}(typeof (global) === "undefined" ? window : global));