Port manager's lock file should be created with proper permissions; we must use umask...

[modules/kernel.git] / bin / salome_session.py

diff --git a/bin/salome_session.py b/bin/salome_session.py
index 8c823b48616ed79d2ac2ba6601d4dbbf367b3c42..d24054e00027241b5dc647e1a24973b5eed39996 100644 (file)
--- a/bin/salome_session.py
+++ b/bin/salome_session.py
@@ -1,3 +1,30 @@
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2015  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, or (at your option) any later version.
+#
+# 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
@@ -6,9 +33,12 @@ import socket
 
 _session = None
 
-def startSession(modules=[]):
+def startSession(modules=None):
+    if modules is None:
+        modules = []
     global _session
     if _session: return
+    from searchFreePort import searchFreePort
     searchFreePort()
     _session = SalomeSession(modules)
     return
@@ -21,52 +51,12 @@ def getShortHostName():
     socket.gethostname() gives short or complete Hostname, depending on
     defined aliases.
     """
-    return string.split(socket.gethostname(),'.')[0]
-
-def searchFreePort():
-    print "Searching a free port for naming service:",
-    NSPORT=2810
-    limit=NSPORT
-    limit=limit+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
-            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['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"
-            raise msg
-        NSPORT=NSPORT+1
-        pass
-    os.environ['NSHOST']=hostname
-    os.environ['NSPORT']=str(NSPORT)
-    return NSPORT
+    from salome_utils import getShortHostName
+    return getShortHostName()
 
 
 class SalomeSession(object):
+    """Salome session launcher"""
     import runSalome
     import killSalomeWithPort
     import killSalome