extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-02-13 00:50:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Standardize on camelCase in Logging

Browse Source
This commit is contained in:
Samuel Mannehed 2020-05-31 23:24:58 +02:00 committed by Lauri Kasanen
parent 472ede66ea
commit a3e2b1e46e
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kasmweb/app/ui.js
View File

@ -2001,7 +2001,7 @@ const UI = {
}, },
updateLogging() { updateLogging() {
WebUtil.init_logging(UI.getSetting('logging')); WebUtil.initLogging(UI.getSetting('logging'));
}, },
updateDesktopName(e) { updateDesktopName(e) {

8
kasmweb/app/webutil.js
View File

@ -6,16 +6,16 @@
* See README.md for usage and integration instructions. * 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 // init log level reading the logging HTTP param
export function init_logging(level) { export function initLogging(level) {
"use strict"; "use strict";
if (typeof level !== "undefined") { if (typeof level !== "undefined") {
main_init_logging(level); mainInitLogging(level);
} else { } else {
const param = document.location.href.match(/logging=([A-Za-z0-9._-]*)/); const param = document.location.href.match(/logging=([A-Za-z0-9._-]*)/);
main_init_logging(param || undefined); mainInitLogging(param || undefined);
} }
} }

14
kasmweb/core/util/logging.js
View File

@ -10,18 +10,18 @@
* Logging/debug routines * Logging/debug routines
*/ */
let _log_level = 'warn'; let _logLevel = 'warn';
let Debug = () => {}; let Debug = () => {};
let Info = () => {}; let Info = () => {};
let Warn = () => {}; let Warn = () => {};
let Error = () => {}; let Error = () => {};
export function init_logging(level) { export function initLogging(level) {
if (typeof level === 'undefined') { if (typeof level === 'undefined') {
level = _log_level; level = _logLevel;
} else { } else {
_log_level = level; _logLevel = level;
} }
Debug = Info = Warn = Error = () => {}; Debug = Info = Warn = Error = () => {};
@ -46,11 +46,11 @@ export function init_logging(level) {
} }
} }
export function get_logging() { export function getLogging() {
return _log_level; return _logLevel;
} }
export { Debug, Info, Warn, Error }; export { Debug, Info, Warn, Error };
// Initialize logging level // Initialize logging level
init_logging(); initLogging();

12
kasmweb/tests/test.util.js
View File

@ -22,37 +22,37 @@ describe('Utils', function () {
console.warn.restore(); console.warn.restore();
console.error.restore(); console.error.restore();
console.info.restore(); console.info.restore();
Log.init_logging(); Log.initLogging();
}); });
it('should use noop for levels lower than the min level', function () { it('should use noop for levels lower than the min level', function () {
Log.init_logging('warn'); Log.initLogging('warn');
Log.Debug('hi'); Log.Debug('hi');
Log.Info('hello'); Log.Info('hello');
expect(console.log).to.not.have.been.called; expect(console.log).to.not.have.been.called;
}); });
it('should use console.debug for Debug', function () { it('should use console.debug for Debug', function () {
Log.init_logging('debug'); Log.initLogging('debug');
Log.Debug('dbg'); Log.Debug('dbg');
expect(console.debug).to.have.been.calledWith('dbg'); expect(console.debug).to.have.been.calledWith('dbg');
}); });
it('should use console.info for Info', function () { it('should use console.info for Info', function () {
Log.init_logging('debug'); Log.initLogging('debug');
Log.Info('inf'); Log.Info('inf');
expect(console.info).to.have.been.calledWith('inf'); expect(console.info).to.have.been.calledWith('inf');
}); });
it('should use console.warn for Warn', function () { it('should use console.warn for Warn', function () {
Log.init_logging('warn'); Log.initLogging('warn');
Log.Warn('wrn'); Log.Warn('wrn');
expect(console.warn).to.have.been.called; expect(console.warn).to.have.been.called;
expect(console.warn).to.have.been.calledWith('wrn'); expect(console.warn).to.have.been.calledWith('wrn');
}); });
it('should use console.error for Error', function () { it('should use console.error for Error', function () {
Log.init_logging('error'); Log.initLogging('error');
Log.Error('err'); Log.Error('err');
expect(console.error).to.have.been.called; expect(console.error).to.have.been.called;
expect(console.error).to.have.been.calledWith('err'); expect(console.error).to.have.been.calledWith('err');