Merge pull request #1701 from yatam-manasa/topic-performance

This is for adding few extra lines of logging which are needed

Author: RLIndia

server/app/services/botService.js

@@ -402,25 +402,25 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
                     //logger.info("Executing BOTs Deatails", bots[0].execution[0].os, bots[0].execution[0].type);
                     masterUtil.getBotRemoteServerDetailByOrgId(bots[0].orgId, function (err, botServerDetails) {
                         if (err) {
-                            logger.error("Error while fetching BOTs Server Details");
+                            logger.error("Error while fetching BOTs Server Details "+"task_id"+taskId);
                             callback(err, null);
                             return;
 
                         } else if (botServerDetails !== null && botServerDetails.length > 0) {
-                            logger.info("Checking flag status--->", appConfig.enableBotExecuterOsCheck)
+                            logger.info("task_id"+taskId+" Checking flag status--->", appConfig.enableBotExecuterOsCheck)
                             if (bots[0].type === 'blueprints') {
                                 botRemoteServerDetails.hostIP = botServerDetails[0].hostIP;
                                 botRemoteServerDetails.hostPort = botServerDetails[0].hostPort;
                             } else {
                                 //As env variable will always be in string changed the check value to string
                                 if (appConfig.enableBotExecuterOsCheck === true || process.env.enableBotExecuterOsCheck === 'true') {
-                                    logger.info("Inn OS check condition");
+                                    logger.info("task_id"+taskId+" Inn OS check condition");
                                     executorOsTypeConditionCheck(botServerDetails, botRemoteServerDetails, bots);
                                 } else {
 
                                     botRemoteServerDetails.hostIP = botServerDetails[0].hostIP;
                                     botRemoteServerDetails.hostPort = botServerDetails[0].hostPort;
-                                    logger.info("Default Details as working without Multiple executor feature", botRemoteServerDetails.hostIP, botRemoteServerDetails.hostPort);
+                                    logger.info("task_id"+taskId+" Default Details as working without Multiple executor feature", botRemoteServerDetails.hostIP, botRemoteServerDetails.hostPort);
                                 }
                             }
                             encryptedParam(reqBody, next);
@@ -451,15 +451,15 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
             if (reqBody.nodeIds) {
                 botObj.params.nodeIds = reqBody.nodeIds;
             }
-            logger.info("Updating bot details" + JSON.stringify(botObj));
+            logger.info("task_id"+taskId+" Updating bot details" + JSON.stringify(botObj));
             botDao.updateBotsDetail(botId, botObj, next);
         },
         function (updateStatus, next) {
             botDao.getBotsById(botId, next);
         },
         function (botDetails, next) {
             if (botDetails.length > 0) {
-                logger.info("Executor in parallel " + JSON.stringify(botDetails));
+                logger.info("task_id"+taskId+" Executor in parallel " + JSON.stringify(botDetails));
                 async.parallel({
                     executor: function (callback) {
                         async.waterfall([
@@ -522,6 +522,7 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
                                     jenkinsExecutor.execute(botDetails[0], auditTrail, reqBody, userName, next);
                                 } else {
                                     var err = new Error('Invalid BOT Type');
+                                    logger.error("Error: Invalid BOT Type "+"task_id"+taskId)
                                     err.status = 400;
                                     err.msg = 'Invalid BOT Type';
                                     callback(err, null);
@@ -547,7 +548,7 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
                             botDao.updateBotsDetail(botId, botUpdateObj, callback);
                         } else {
                             var err = new Error('Invalid BOT Type');
-                            logger.error("task_id"+taskId+" Invalid BOT Type")
+                            logger.error("Error: Invalid BOT Type "+"task_id"+taskId)
                             err.status = 400;
                             err.msg = 'Invalid BOT Type';
                             callback(err, null);
@@ -561,7 +562,7 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
                     }
                 });
             } else {
-                logger.info("No Botdetails found ");
+                logger.error("Error: No Botdetails found "+"task_id"+taskId);
                 next(null, botDetails);
             }
         }
@@ -571,7 +572,7 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
             callback(err, null);
             return;
         } else {
-            logger.info("Completed Bot execution " + JSON.stringify(results));
+            logger.info("task_id"+taskId+" Completed Bot execution " + JSON.stringify(results));
             callback(null, results);
             return;
         }