From b6667755c3bf3adf942648b410b87e5ef276899f Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 17 Feb 2022 07:50:58 +0100 Subject: [PATCH] Simplify the command generated by the remote launch. Thanks to test_launcher.py that reveals it --- src/Launcher/Launcher_Job_PythonSALOME.cxx | 4 +-- src/Launcher/Launcher_Job_SALOME.cxx | 38 ---------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/src/Launcher/Launcher_Job_PythonSALOME.cxx b/src/Launcher/Launcher_Job_PythonSALOME.cxx index 296f35f46..6b803e36e 100644 --- a/src/Launcher/Launcher_Job_PythonSALOME.cxx +++ b/src/Launcher/Launcher_Job_PythonSALOME.cxx @@ -43,7 +43,7 @@ Launcher::Job_PythonSALOME::addJobTypeSpecificScript(std::ofstream & launch_scri struct stat statbuf; if(stat(getenv("APPLI"), &statbuf) ==0 && S_ISREG(statbuf.st_mode)) // case where AppliPath hold a salome launcher file - launch_script_stream << _resource_definition.AppliPath << " shell -p \"$appli_port\" python " << _job_file_name_complete << " > logs/python_" << _launch_date << ".log 2>&1" << std::endl; + launch_script_stream << _resource_definition.AppliPath << " shell -- python " << _job_file_name_complete << " > logs/python_" << _launch_date << ".log 2>&1" << std::endl; else - launch_script_stream << _resource_definition.AppliPath << "/salome shell -p \"$appli_port\" python " << _job_file_name_complete << " > logs/python_" << _launch_date << ".log 2>&1" << std::endl; + launch_script_stream << _resource_definition.AppliPath << "/salome shell -- python " << _job_file_name_complete << " > logs/python_" << _launch_date << ".log 2>&1" << std::endl; } diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx index 394d3aac6..58a1a8dbc 100644 --- a/src/Launcher/Launcher_Job_SALOME.cxx +++ b/src/Launcher/Launcher_Job_SALOME.cxx @@ -133,50 +133,12 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params) launch_script_stream << "} > $CATALOG_FILE" << std::endl; launch_script_stream << "fi" << std::endl; } - if(_activateSession) - { - // Create file for ns-port-log - if (is_launcher_file) - // for a salome application file, we write NS_PORT_FILE_PATH in working directory - launch_script_stream << "NS_PORT_FILE_PATH=$(mktemp " << work_directory << "/nsport_" << _launch_date << "_XXXXXX) &&\n"; - else - launch_script_stream << "NS_PORT_FILE_PATH=$(mktemp " << _resource_definition.AppliPath << "/USERS/nsport_XXXXXX) &&\n"; - - // Launch SALOME with an appli - if (is_launcher_file) - launch_script_stream << _resource_definition.AppliPath << " start --terminal --ns-port-log=\"$NS_PORT_FILE_PATH\" --server-launch-mode=fork "; - else - launch_script_stream << _resource_definition.AppliPath << "/salome start --terminal --ns-port-log=\"$NS_PORT_FILE_PATH\" --server-launch-mode=fork "; - launch_script_stream << "> logs/salome_" << _launch_date << ".log 2>&1 &&" << std::endl; - launch_script_stream << "current=0 &&\n" - << "stop=20 &&\n" - << "while ! test -s \"$NS_PORT_FILE_PATH\"\n" - << "do\n" - << " sleep 2\n" - << " current=$((current+1))\n" - << " if [ \"$current\" -eq \"$stop\" ] ; then\n" - << " echo Error Naming Service failed ! >&2\n" - << " exit\n" - << " fi\n" - << "done &&\n" - << "appli_port=$(cat \"$NS_PORT_FILE_PATH\") &&\n" - << "rm \"$NS_PORT_FILE_PATH\" &&\n"; - } // Call real job type addJobTypeSpecificScript(launch_script_stream); // log the exit code launch_script_stream << "echo $? > logs/exit_code.log" << std::endl; - // End - if(_activateSession) - { - if (is_launcher_file) - launch_script_stream << _resource_definition.AppliPath << " kill \"$appli_port\"" << std::endl; - else - launch_script_stream << _resource_definition.AppliPath << "/salome kill \"$appli_port\"" << std::endl; - } - // Return launch_script_stream.flush(); launch_script_stream.close(); -- 2.39.2