From: ribes <ribes>
Date: Tue, 17 Nov 2009 09:58:16 +0000 (+0000)
Subject: - Use port argument of runSession
X-Git-Tag: new_launcher_alpha_091119~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=accc66c543f1c61a9b9a03054ee623494bb7a3ec;p=modules%2Fkernel.git

- Use port argument of runSession
- Clean shutdown
---

diff --git a/src/Launcher/Launcher_Job_YACSFile.cxx b/src/Launcher/Launcher_Job_YACSFile.cxx
index ff99d9cde..511e5c306 100644
--- a/src/Launcher/Launcher_Job_YACSFile.cxx
+++ b/src/Launcher/Launcher_Job_YACSFile.cxx
@@ -135,9 +135,9 @@ Launcher::Job_YACSFile::buildSalomeCouplingScript(Batch::Parametre params)
 		       << "    exit\n"
 		       << "  fi\n"
 		       << "done\n"
-		       << "port=`cat " << _machine_definition.AppliPath << "/" << launch_date_port_file << "`\n";
-  launch_script_stream << _machine_definition.AppliPath << "/runSession driver " << yacs_file_name << ".xml > logs/yacs_" << launch_date << ".log 2>&1" << std::endl;
-  launch_script_stream << _machine_definition.AppliPath << "/runSession killSalomeWithPort.py $port" << std::endl;
+		       << "appli_port=`cat " << _machine_definition.AppliPath << "/" << launch_date_port_file << "`\n";
+  launch_script_stream << _machine_definition.AppliPath << "/runSession -p $appli_port driver " << yacs_file_name << ".xml > logs/yacs_" << launch_date << ".log 2>&1" << std::endl;
+  launch_script_stream << _machine_definition.AppliPath << "/runSession -p $appli_port shutdownSalome.py" << std::endl;
 
   // Return
   launch_script_stream.flush();