Edit log messages to be consistent

Signed-off-by: Katherine Stanley <katheris@uk.ibm.com>
ibm-developer · Jan 23, 2018 · 5ab7fb2 · 5ab7fb2
1 parent dfbd147
commit 5ab7fb2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/npm/lib/config.js b/npm/lib/config.js
@@ -188,8 +188,8 @@ function Config(defaults) {
           }
         }
       } catch (err) {
-        logger.writeToLog(`${logId} : Error reading ` + this.configFiles[i] + ' : ' + err);
-        logger.writeToLog(`${logId} : code : ` + output);
+        logger.writeToLog(`${logId}:config - Error reading ` + this.configFiles[i] + ' : ' + err);
+        logger.writeToLog(`${logId}:config - code : ` + output);
         throw err;
       }
     }

diff --git a/npm/lib/context.js b/npm/lib/context.js
@@ -55,15 +55,15 @@ function Context(id, config) {
     if(!this.paths.length) {
       return;   //not being written by us
     }
-    this.logger.writeToLog(`${logId} : Destination path`, generator.destinationRoot());
+    this.logger.writeToLog(`${logId}:writing - Destination path`, generator.destinationRoot());
     return this.processor.scan(this.conf, (relativePath, template) => {
       let outFile = generator.destinationPath(relativePath);
       try {
         let compiledTemplate = Handlebars.compile(template);
         let output = compiledTemplate(this.conf);
         generator.fs.write(outFile, output);
       } catch (err) {
-        this.logger.writeToLog(`${logId} : Template error : ` + relativePath, err.message);
+        this.logger.writeToLog(`${logId}:writing - Template error : ` + relativePath, err.message);
       }
     }, this.paths);
   }

diff --git a/npm/lib/control.js b/npm/lib/control.js
@@ -97,10 +97,9 @@ Control.prototype.processProject = function() {
       }
     }
   } catch (err) {
-    logger.writeToLog(`${logId} : Control block error : template`, template);
+    logger.writeToLog(`${logId}:control -  Control block error in template`, template);
     throw err;
   }
-  logger.writeToLog(`${logId} : Control data`, this.controlBlock);
 }
 
 //controls whether or not a file should be included in a generation

diff --git a/npm/lib/fsprocessor.js b/npm/lib/fsprocessor.js
@@ -35,7 +35,7 @@ const dirwalk = function (root, tracker, resolver) {
     if (err) {
       //TODO : appscan for Java does not like you putting too much info in the error messages, need to check for JS
       console.error("There was an error reading the template directory");
-      logger.writeToLog(`${logId} : Folder error`, err);
+      logger.writeToLog(`${logId}:fsprocessor - Folder error`, err);
       resolver.reject(err);
       return;
     }
@@ -53,7 +53,7 @@ const dirwalk = function (root, tracker, resolver) {
           //console.log("Found file " + file + " : " + relativePath);
           if (err) {
             console.error("Error reading file ");
-            logger.writeToLog(`${logId} : File error`, err);
+            logger.writeToLog(`${logId}:fsprocessor - File error`, err);
             resolver.reject(err);
             return;
           }
@@ -141,12 +141,12 @@ const startWalk = function (config, cb, paths) {
 const getContentsSync = function (value) {
   let file = fspath.resolve(value);
   if (!fs.existsSync(file)) {
-    logger.writeToLog(`${logId} : Error : specified file does not exist`, file);
+    logger.writeToLog(`${logId}:fsprocessor - Error : specified file does not exist`, file);
     throw "Error : specified file does not exist";
   }
   let stats = fs.statSync(file);
   if (stats.isDirectory()) {
-    logger.writeToLog(`${logId} : Error : specified path is a directory`, file);
+    logger.writeToLog(`${logId}:fsprocessor - Error : specified path is a directory`, file);
     throw "Error : specified path is a directory";
   }
   try {
@@ -159,7 +159,7 @@ const getContentsSync = function (value) {
     }
   } catch (err) {
     /* istanbul ignore next */    //file error reading checked in other tests
-    logger.writeToLog(`${logId} : Error : reading : ` + file, err);
+    logger.writeToLog(`${logId}:fsprocessor - Error : reading : ` + file, err);
     /* istanbul ignore next */
     throw err;
   }