Merge pull request #4489 from NativeScript/tachev/update-log4js

chore: update log4js to its latest version

Author: Dimitar Tachev

config/config.json

@@ -1,12 +1,11 @@
 {
 	"DEBUG": false,
 	"TYPESCRIPT_COMPILER_OPTIONS": {},
-	"CI_LOGGER": false,
 	"ANDROID_DEBUG_UI_MAC": "Google Chrome",
 	"USE_POD_SANDBOX": false,
 	"DISABLE_HOOKS": false,
 	"UPLOAD_PLAYGROUND_FILES_ENDPOINT": "https://play.nativescript.org/api/files",
 	"SHORTEN_URL_ENDPOINT": "https://play.nativescript.org/api/shortenurl?longUrl=%s",
 	"PREVIEW_APP_ENVIRONMENT": "live",
 	"GA_TRACKING_ID": "UA-111455-51"
-}
+}

lib/android-tools-info.ts

@@ -33,7 +33,8 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $options: IOptions,
-		protected $staticConfig: Config.IStaticConfig) { }
+		protected $staticConfig: Config.IStaticConfig) {
+	}
 
 	@cache()
 	public getToolsInfo(): IAndroidToolsInfoData {

lib/common/commands/device/list-devices.ts

@@ -30,7 +30,6 @@ export class ListDevicesCommand implements ICommand {
 		const table: any = createTable(["#", "Device Name", "Platform", "Device Identifier", "Type", "Status"], []);
 		let action: (_device: Mobile.IDevice) => Promise<void>;
 		if (this.$options.json) {
-			this.$logger.setLevel("ERROR");
 			action = async (device) => {
 				this.$logger.out(JSON.stringify(device.deviceInfo));
 			};

lib/common/definitions/config.d.ts

@@ -28,7 +28,6 @@ declare module Config {
 
 	interface IConfig {
 		DEBUG?: boolean;
-		CI_LOGGER?: boolean;
 		DISABLE_HOOKS: boolean;
 	}
 }

lib/common/definitions/log4js.d.ts

@@ -1,5 +1,4 @@
 interface ILogger {
-	setLevel(level: string): void;
 	getLevel(): string;
 	fatal(formatStr?: any, ...args: any[]): void;
 	error(formatStr?: any, ...args: any[]): void;

lib/common/definitions/logger.d.ts

@@ -6,37 +6,36 @@ const TerminalRenderer = require("marked-terminal");
 const chalk = require("chalk");
 
 export class Logger implements ILogger {
-	private log4jsLogger: log4js.ILogger = null;
+	private log4jsLogger: log4js.Logger = null;
 	private passwordRegex = /(password=).*?(['&,]|$)|(password["']?\s*:\s*["']).*?(["'])/i;
 	private passwordReplacement = "$1$3*******$2$4";
 	private static LABEL = "[WARNING]:";
 
 	constructor($config: Config.IConfig,
 		private $options: IOptions) {
-		const appenders: log4js.IAppender[] = [];
-
-		if (!$config.CI_LOGGER) {
-			appenders.push({
-				type: "console",
-				layout: {
-					type: "messagePassThrough"
-				}
-			});
-		}
-
-		log4js.configure({ appenders: appenders });
-
-		this.log4jsLogger = log4js.getLogger();
-
+		const appenders: IDictionary<log4js.Appender> = {};
+		const categories: IDictionary<{ appenders: string[]; level: string; }> = {};
+		let level: string = null;
 		if (this.$options.log) {
-			this.log4jsLogger.setLevel(this.$options.log);
+			level = this.$options.log;
 		} else {
-			this.log4jsLogger.setLevel($config.DEBUG ? "TRACE" : "INFO");
+			level = $config.DEBUG ? "TRACE" : "INFO";
 		}
-	}
 
-	setLevel(level: string): void {
-		this.log4jsLogger.setLevel(level);
+		appenders["out"] = {
+			type: "console",
+			layout: {
+				type: "messagePassThrough"
+			}
+		};
+		categories["default"] = {
+			appenders: ['out'],
+			level
+		};
+
+		log4js.configure({ appenders, categories });
+
+		this.log4jsLogger = log4js.getLogger();
 	}
 
 	getLevel(): string {

lib/common/logger.ts

@@ -18,7 +18,6 @@ export class LockServiceStub implements ILockService {
 }
 
 export class CommonLoggerStub implements ILogger {
-	setLevel(level: string): void { }
 	getLevel(): string { return undefined; }
 	fatal(...args: string[]): void { }
 	error(...args: string[]): void { }
@@ -175,7 +174,6 @@ export class DeviceLogProviderStub extends EventEmitter implements Mobile.IDevic
 	}
 
 	setLogLevel(level: string, deviceIdentifier?: string): void {
-		this.logger.setLevel(level);
 	}
 
 	setApplicationPidForDevice(deviceIdentifier: string, pid: string): void {

lib/common/test/unit-tests/stubs.ts

@@ -3,7 +3,6 @@ import * as shelljs from "shelljs";
 import * as os from "os";
 
 export class Configuration implements IConfiguration { // User specific config
-	CI_LOGGER = false;
 	DEBUG = false;
 	ANDROID_DEBUG_UI: string = null;
 	USE_POD_SANDBOX: boolean = false;

lib/config.ts

@@ -50,7 +50,7 @@
     "istextorbinary": "2.2.1",
     "jimp": "0.2.28",
     "lodash": "4.17.11",
-    "log4js": "1.0.1",
+    "log4js": "4.1.0",
     "marked": "0.5.1",
     "marked-terminal": "3.1.1",
     "minimatch": "3.0.2",