remove azure logging

Siyer2 · Dec 18, 2018 · c56ae3e · c56ae3e
1 parent 7d94938
commit c56ae3e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 747 deletions.
diff --git a/lib/core/log.js b/lib/core/log.js
@@ -18,75 +18,40 @@
  */
 
 var Logger = require('bunyan');
-var azure = require('az-bunyan');
-var azureStorage = require('azure-storage');
 
 var Levels = {
 	'DEBUG': 1,
 	'INFO': 2,
 	'WARN': 3,
 	'ERROR': 4
-};
+}
 
-var configureAzureStorage = function configureAzureStorage() {
-	var success = true;
+let logStreams = [];
 
-	try {
-		if (!process.env.applog_connectionstring || !process.env.applog_table) {
-			success = false;
-		}
-		else {
-			// Create storage for applogs
-			var appLogTableService = azureStorage.createTableService(process.env.applog_connectionstring);
-			appLogTableService.createTableIfNotExists(process.env.applog_table, function (error, result, response) {
-				if (error) {
-					success = false;
-				}
-			});
+if (process.env.enable_log_file === 'true') {
+	logStreams.push(
+		{
+			type: 'rotating-file',
+			period: '1d',
+			count: 2,
+			path: `node-rdpjs${process.pid}.log`,
+			level: process.env.log_level
 		}
-	}
-	catch (err) {
-		success = false;
-	}
-
-	return success;
-};
+	);
+}
 
-var appStorageAvailable = configureAzureStorage();
-var logger = undefined;
-if (appStorageAvailable) {
-	// Create main application logger
-	var azureAppLogStream = azure.createTableStorageStream(process.env.log_level, {
-		connectionString: process.env.applog_connectionstring,
-		tableName: process.env.applog_table
-	});
+logStreams.push(
+	{
+		stream: process.stderr,
+		level: process.env.log_level
+	}
+);
 
-	//Remove the next line when az-bunyan fixes createTableStorageStream to assign the log_level.
-	azureAppLogStream.level = process.env.log_level;
+this.log = Logger.createLogger({
+	name: 'node-rdpjs',
+	streams: logStreams
+});
 
-	logger = Logger.createLogger({
-		name: 'node-rdpjs',
-		streams: [azureAppLogStream]
-	});
-}
-else {
-	logger = Logger.createLogger({
-		name: 'node-rdpjs',
-		streams: [
-			{
-				type: 'rotating-file',
-				period: '1d',
-				count: 2,
-				path: `node-rdpjs${process.pid}.log`,
-				level: process.env.log_level
-			},
-			{
-				stream: process.stderr,
-				level: process.env.log_level
-			}
-		]
-	});
-}
 
 function log(level, message) {
 	if (Levels[level] < module.exports.level) return;
@@ -103,4 +68,4 @@ module.exports = {
 	info: function (message) { logger.info(message); },
 	warn: function (message) { logger.warn(message); },
 	error: function (message) { logger.error(message); }
-};
+};