dds-slurm-plugin: Fixed: fixed path to demonised log file.

- This log is created if plug-in failed to start

ReleaseNotes.md

@@ -23,6 +23,7 @@ Modified: improved default SID storage and handling. (GH-318)
 
 ### dds-slurm-plugin
 Fixed: a couple of fixes in Slurm plugin found on a Virgo cluster.    
+Fixed: fixed path to demonised log file. This log is created if plug-in failed to start.   
 
 ## v3.4 (2020-07-01)
 

dds-daemonize/src/main.cpp

@@ -81,4 +81,4 @@ int main(int argc, char* argv[])
         execvp(argv[2], cmd_arg);
 
     return 0;
-}
+}

plugins/dds-submit-lsf/src/main.cpp

@@ -175,15 +175,15 @@ int main(int argc, char* argv[])
                 fs::path pathlsfScript(pathPluginDir);
                 pathlsfScript /= "dds-submit-lsf-worker";
                 stringstream cmd;
-                cmd << "$DDS_LOCATION/bin/dds-daemonize " << pathPluginDir.string() << " /bin/bash -c \""
+                cmd << "$DDS_LOCATION/bin/dds-daemonize " << sSandboxDir << " /bin/bash -c \""
                     << pathlsfScript.string() << "\"";
 
                 proto.sendMessage(dds::intercom_api::EMsgSeverity::info, "Preparing job submission...");
                 string output;
                 pid_t exitCode = execute(cmd.str(), chrono::seconds(30), &output);
 
                 // In case of error there can be a bash.out.log created, let's check it's content
-                fs::path pathBashlog(pathPluginDir);
+                fs::path pathBashlog(sSandboxDir);
                 pathBashlog /= "bash.out.log";
 
                 if (exitCode == 0)

plugins/dds-submit-pbs/src/main.cpp

@@ -171,15 +171,15 @@ int main(int argc, char* argv[])
                 fs::path pathPBSScript(pathPluginDir);
                 pathPBSScript /= "dds-submit-pbs-worker";
                 stringstream cmd;
-                cmd << "$DDS_LOCATION/bin/dds-daemonize " << pathPluginDir.string() << " /bin/bash -c \""
+                cmd << "$DDS_LOCATION/bin/dds-daemonize " << sSandboxDir << " /bin/bash -c \""
                     << pathPBSScript.string() << "\"";
 
                 proto.sendMessage(dds::intercom_api::EMsgSeverity::info, "Preparing job submission...");
                 string output;
                 pid_t exitCode = execute(cmd.str(), chrono::seconds(30), &output);
 
                 // In case of error there can be a bash.out.log created, let's check it's content
-                fs::path pathBashlog(pathPluginDir);
+                fs::path pathBashlog(sSandboxDir);
                 pathBashlog /= "bash.out.log";
 
                 if (exitCode == 0)

plugins/dds-submit-slurm/src/main.cpp

@@ -183,15 +183,15 @@ int main(int argc, char* argv[])
                 fs::path pathSLURMScript(pathPluginDir);
                 pathSLURMScript /= "dds-submit-slurm-worker";
                 stringstream cmd;
-                cmd << "$DDS_LOCATION/bin/dds-daemonize " << pathPluginDir.string() << " /bin/bash -c \""
+                cmd << "$DDS_LOCATION/bin/dds-daemonize " << sSandboxDir << " /bin/bash -c \""
                     << pathSLURMScript.string() << "\"";
 
                 proto.sendMessage(dds::intercom_api::EMsgSeverity::info, "Preparing job submission...");
                 string output;
                 pid_t exitCode = execute(cmd.str(), chrono::seconds(30), &output);
 
                 // In case of error there can be a bash.out.log created, let's check it's content
-                fs::path pathBashlog(pathPluginDir);
+                fs::path pathBashlog(sSandboxDir);
                 pathBashlog /= "bash.out.log";
 
                 if (exitCode == 0)