X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=bin%2Fsalome_session.py;h=be227c89f0a67757f5eaefb29c62379a06f7f28f;hb=fd31f4c605d9663ee6cbd4c60fad102a4d73a190;hp=8c823b48616ed79d2ac2ba6601d4dbbf367b3c42;hpb=1a9c06c1b6b7bb7a2a9787229e1c113f4c81cb0c;p=modules%2Fkernel.git

diff --git a/bin/salome_session.py b/bin/salome_session.py
index 8c823b486..be227c89f 100644
--- a/bin/salome_session.py
+++ b/bin/salome_session.py
@@ -1,3 +1,29 @@
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+## @package salome_session
+# \brief Module that provides the SalomeSession object that helps to launch
+#        a SALOME script session
+#
+#
 
 import os
 import sys
@@ -21,52 +47,65 @@ def getShortHostName():
     socket.gethostname() gives short or complete Hostname, depending on
     defined aliases.
     """
-    return string.split(socket.gethostname(),'.')[0]
+    from salome_utils import getShortHostName
+    return getShortHostName()
 
 def searchFreePort():
+    """
+    Search free port for SALOME session.
+    Returns first found free port number.
+    """
     print "Searching a free port for naming service:",
-    NSPORT=2810
-    limit=NSPORT
-    limit=limit+100
+    from salome_utils import generateFileName, getHostName
+    hostname = getHostName()
+    NSPORT = 2810
+    limit  = NSPORT+100
     while 1:
         print "%s "%(NSPORT),
         status = os.system("netstat -ltn | grep -E :%s"%(NSPORT))
         if status:
-            home = os.environ['HOME']
-            appli=os.environ.get("APPLI")
-            if appli is None:
-                #Run outside application context
-                home=home
-            else:
-                home='%s/%s'%(home,appli)
-            hostname=getShortHostName()
-            omniorb_config = '%s/.omniORB_%s_%s.cfg'%(home,hostname, NSPORT)
-            os.environ['OMNIORB_CONFIG'] = omniorb_config
+            home  = os.getenv("HOME")
+            appli = os.getenv("APPLI")
+            kwargs={}
+            if appli is not None: 
+              home = os.path.join(home, appli,"USERS")
+              kwargs["with_username"]=True
+            omniorb_config = generateFileName(home, prefix="omniORB",
+                                              extension="cfg",
+                                              hidden=True,
+                                              with_hostname=True,
+                                              with_port=NSPORT,
+                                              **kwargs)
             f = open(omniorb_config, "w")
             f.write("ORBInitRef NameService=corbaname::%s:%s\n"%(hostname, NSPORT))
             f.close()
-            last_running_config = '%s/.omniORB_%s_last.cfg'%(home, hostname)
+            os.environ['OMNIORB_CONFIG'] = omniorb_config
+            last_running_config = generateFileName(home, prefix="omniORB",
+                                                   suffix="last",
+                                                   extension="cfg",
+                                                   hidden=True,
+                                                   **kwargs)
             os.environ['LAST_RUNNING_CONFIG'] = last_running_config
             if os.access(last_running_config,os.F_OK):
                 os.unlink(last_running_config)
                 pass
             os.symlink(omniorb_config,last_running_config)
-            #            LAST_RUNNING_CONFIG=${HOME}/${APPLI}/.omniORB_${myhost}_last.cfg
             print "- Ok"
             break
         if NSPORT == limit:
             msg  = ""
-            msg += "I Can't find a free port to launch omniNames\n"
-            msg += "I suggest you to kill the running servers and try again.\n"
+            msg += "Can not find a free port to launch omniNames\n"
+            msg += "Kill the running servers and try again.\n"
             raise msg
-        NSPORT=NSPORT+1
+        NSPORT = NSPORT+1
         pass
-    os.environ['NSHOST']=hostname
-    os.environ['NSPORT']=str(NSPORT)
+    os.environ['NSHOST'] = hostname
+    os.environ['NSPORT'] = str(NSPORT)
     return NSPORT
 
 
 class SalomeSession(object):
+    """Salome session launcher"""
     import runSalome
     import killSalomeWithPort
     import killSalome