From: Samuel Mannehed <samuel@cendio.se>
Date: Sun, 31 May 2020 21:24:58 +0000 (+0200)
Subject: Standardize on camelCase in Logging
X-Git-Tag: v1.2.0~17^2~4
X-Git-Url: https://git.proxmox.com/?p=mirror_novnc.git;a=commitdiff_plain;h=a7fe079f81bcb8982379746bbc3cf4d3ee0fa262

Standardize on camelCase in Logging
---

diff --git a/app/ui.js b/app/ui.js
index 7207b2f..d0ec523 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1683,7 +1683,7 @@ const UI = {
     },
 
     updateLogging() {
-        WebUtil.init_logging(UI.getSetting('logging'));
+        WebUtil.initLogging(UI.getSetting('logging'));
     },
 
     updateDesktopName(e) {
diff --git a/app/webutil.js b/app/webutil.js
index e552d42..0c4823f 100644
--- a/app/webutil.js
+++ b/app/webutil.js
@@ -6,16 +6,16 @@
  * See README.md for usage and integration instructions.
  */
 
-import { init_logging as main_init_logging } from '../core/util/logging.js';
+import { initLogging as mainInitLogging } from '../core/util/logging.js';
 
 // init log level reading the logging HTTP param
-export function init_logging(level) {
+export function initLogging(level) {
     "use strict";
     if (typeof level !== "undefined") {
-        main_init_logging(level);
+        mainInitLogging(level);
     } else {
         const param = document.location.href.match(/logging=([A-Za-z0-9._-]*)/);
-        main_init_logging(param || undefined);
+        mainInitLogging(param || undefined);
     }
 }
 
diff --git a/core/util/logging.js b/core/util/logging.js
index 8978a07..fe449e9 100644
--- a/core/util/logging.js
+++ b/core/util/logging.js
@@ -10,18 +10,18 @@
  * Logging/debug routines
  */
 
-let _log_level = 'warn';
+let _logLevel = 'warn';
 
 let Debug = () => {};
 let Info = () => {};
 let Warn = () => {};
 let Error = () => {};
 
-export function init_logging(level) {
+export function initLogging(level) {
     if (typeof level === 'undefined') {
-        level = _log_level;
+        level = _logLevel;
     } else {
-        _log_level = level;
+        _logLevel = level;
     }
 
     Debug = Info = Warn = Error = () => {};
@@ -46,11 +46,11 @@ export function init_logging(level) {
     }
 }
 
-export function get_logging() {
-    return _log_level;
+export function getLogging() {
+    return _logLevel;
 }
 
 export { Debug, Info, Warn, Error };
 
 // Initialize logging level
-init_logging();
+initLogging();
diff --git a/tests/test.util.js b/tests/test.util.js
index fb1d037..cd61f24 100644
--- a/tests/test.util.js
+++ b/tests/test.util.js
@@ -22,37 +22,37 @@ describe('Utils', function () {
             console.warn.restore();
             console.error.restore();
             console.info.restore();
-            Log.init_logging();
+            Log.initLogging();
         });
 
         it('should use noop for levels lower than the min level', function () {
-            Log.init_logging('warn');
+            Log.initLogging('warn');
             Log.Debug('hi');
             Log.Info('hello');
             expect(console.log).to.not.have.been.called;
         });
 
         it('should use console.debug for Debug', function () {
-            Log.init_logging('debug');
+            Log.initLogging('debug');
             Log.Debug('dbg');
             expect(console.debug).to.have.been.calledWith('dbg');
         });
 
         it('should use console.info for Info', function () {
-            Log.init_logging('debug');
+            Log.initLogging('debug');
             Log.Info('inf');
             expect(console.info).to.have.been.calledWith('inf');
         });
 
         it('should use console.warn for Warn', function () {
-            Log.init_logging('warn');
+            Log.initLogging('warn');
             Log.Warn('wrn');
             expect(console.warn).to.have.been.called;
             expect(console.warn).to.have.been.calledWith('wrn');
         });
 
         it('should use console.error for Error', function () {
-            Log.init_logging('error');
+            Log.initLogging('error');
             Log.Error('err');
             expect(console.error).to.have.been.called;
             expect(console.error).to.have.been.calledWith('err');