This is to resolve conflict

Author: yatam-manasa

server/app/services/botService.js

@@ -387,7 +387,7 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
         },
         function (scheduledBots, next) {
             if (bots.length > 0) {
-                logger.info("task_id"+taskId+" Got Bots " + JSON.stringify(scheduledBots));
+                logger.info("Got Bots " + JSON.stringify(scheduledBots));
                 botId = bots[0]._id;
                 if (scheduledBots.length > 0) {
                     //included check for params if empty.
@@ -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("task_id"+taskId+" Error while fetching BOTs Server Details");
+                            logger.error("Error while fetching BOTs Server Details");
                             callback(err, null);
                             return;
 
                         } else if (botServerDetails !== null && botServerDetails.length > 0) {
-                            logger.info("task_id"+taskId+" Checking flag status--->", appConfig.enableBotExecuterOsCheck)
+                            logger.info("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("task_id"+taskId+" Inn OS check condition");
+                                    logger.info("Inn OS check condition");
                                     executorOsTypeConditionCheck(botServerDetails, botRemoteServerDetails, bots);
                                 } else {
 
                                     botRemoteServerDetails.hostIP = botServerDetails[0].hostIP;
                                     botRemoteServerDetails.hostPort = botServerDetails[0].hostPort;
-                                    logger.info("task_id"+taskId+" Default Details as working without Multiple executor feature", botRemoteServerDetails.hostIP, botRemoteServerDetails.hostPort);
+                                    logger.info("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("task_id"+taskId+" Updating bot details" + JSON.stringify(botObj));
+            logger.info("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("task_id"+taskId+" Executor in parallel " + JSON.stringify(botDetails));
+                logger.info("Executor in parallel " + JSON.stringify(botDetails));
                 async.parallel({
                     executor: function (callback) {
                         async.waterfall([
@@ -561,17 +561,17 @@ botService.executeBots = function executeBots(botsId, reqBody, userName, executi
                     }
                 });
             } else {
-                logger.info("task_id"+taskId+" No Botdetails found ");
+                logger.info("No Botdetails found ");
                 next(null, botDetails);
             }
         }
     ], function (err, results) {
         if (err) {
-            logger.error("task_id"+taskId+" "+ err);
+            logger.error(err);
             callback(err, null);
             return;
         } else {
-            logger.info("task_id"+taskId+" Completed Bot execution " + JSON.stringify(results));
+            logger.info("Completed Bot execution " + JSON.stringify(results));
             callback(null, results);
             return;
         }