merge branch

Author: petekanev

build/project-template-gradle/build-tools/android-static-binding-generator/ast-parser/helpers/logger.js

@@ -1,48 +1,51 @@
 var fs = require('fs'),
-	path = require('path'),
-	os = require('os'),
+    path = require('path'),
+    os = require('os'),
     fileHelpers = require("./file_helpers")();
 
-module.exports = function(setting){
-	
+module.exports = function (setting) {
     var logDirectory = path.dirname(setting.logPath);
-    if (!fs.existsSync(logDirectory)){
-        console.error("couldn't find logDirectory so it will be created in place:" + setting.logPath);
-        fileHelpers.ensureDirectories(setting.logPath);
-    }
-    if (os.type().indexOf('Windows') === -1) {
-        var appLogStat = fs.statSync(logDirectory);
-        if (canWrite(process.uid === appLogStat.uid, process.gid === appLogStat.gid, appLogStat.mode)){
-            console.error("ERROR WRITING TO LOG FILE DIRECTORY : " + logDirectory);
-            process.exit(-1);
+
+    // TODO: Logging to file disabled temporarily, console output is default
+    
+    // if (!fs.existsSync(logDirectory)) {
+    //     console.error("couldn't find logDirectory so it will be created in place:" + setting.logPath);
+    //     fileHelpers.ensureDirectories(setting.logPath);
+    // }
+    // if (os.type().indexOf('Windows') === -1) {
+    //     var appLogStat = fs.statSync(logDirectory);
+    //     if (canWrite(process.uid === appLogStat.uid, process.gid === appLogStat.gid, appLogStat.mode)) {
+    //         console.error("ERROR WRITING TO LOG FILE DIRECTORY : " + logDirectory);
+    //         process.exit(-1);
+    //     }
+    // }
+
+    var appLog = createLog(setting.APP_NAME, logDirectory, setting);
+
+    if (setting.disable) {
+        for (var prop in appLog) {
+            appLog[prop] = function () { };
         }
     }
 
-    var appLog = createLog(setting.APP_NAME, logDirectory, setting);
-	
-	if(setting.disable) {
-		for(var prop in appLog) {
-			appLog[prop] = function() {};
-		}
-	}
-	return appLog;
+    return appLog;
 };
 
-function canWrite(owner, inGroup, mode){
+function canWrite(owner, inGroup, mode) {
     return owner && (mode & 00200) || // User is owner and owner can write.
         inGroup && (mode & 00020) || // User is in group and group can write.
         (mode & 00002); // Anyone can write.
 }
 
-function createLog(appName, logDirectory, setting){
-	
-	var appLog = {};
-	
+function createLog(appName, logDirectory, setting) {
+
+    var appLog = {};
+
     function getRequestId() {
         return (process.domain && process.domain.id) || "";
     }
 
-    function getLogDate(){
+    function getLogDate() {
         var today = new Date();
 
         var fullYear = today.getFullYear();
@@ -65,28 +68,25 @@ function createLog(appName, logDirectory, setting){
         var logFile = logDirectory + path.sep + appName + ".log";
         var augmentedLine = getLogDate() + "\t" + line + os.EOL
         fs.appendFile(logFile, augmentedLine, function (err) {
-            if(err) {
-                throw "couldn't write to " + logFile; 
+            if (err) {
+                throw "couldn't write to " + logFile;
             }
         });
     }
-    
+
     appLog.log = function (input) {
-		console.log(setMessageWithFormat(input));
-        appendToLogFile(input);
-	}
+        console.log(setMessageWithFormat(input));
+    }
 
     appLog.info = appLog.log;
-    	
+
     appLog.warn = function (input) {
-		console.warn(setMessageWithFormat(input));
-        appendToLogFile(input);
-	}
-	
+        console.warn(setMessageWithFormat(input));
+    }
+
     appLog.error = function (input) {
-		console.error(setMessageWithFormat(input));
-        appendToLogFile(input);
-	}
+        console.error(setMessageWithFormat(input));
+    }
 
     return appLog;
 }