X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=38fb12bc9011f11b41d88b81a91883bb71aa75f0;hp=9fd56a948964a075c96b9d6ef2d09066a13714e3;hb=622bf37d1ff35486e7863ba77fe7683b12fb12d1;hpb=7e1529e1c299394465308aebaed5ffb755d1007a

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 9fd56a9..38fb12b 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,7 +1,10 @@
 
 import os
+import sys
+import time
+
 from PyQt4.QtCore import *
-from sface.sficonfig import config
+from sface.config import config
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -17,17 +20,53 @@ class SfiProcess(QObject):
     def __init__(self, parent=None):
         QObject.__init__(self, parent)
 
+        self.process = QProcess()
+        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
+                     self.processFinished)
+        self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
+                     self.processStandardOutput)
+        self.connect(self.process, SIGNAL("readyReadStandardError()"),
+                     self.processStandardError)
+
     def __init_command(self, args):
         self.args = QStringList()
         for arg in args:
             self.args << QString(arg)
 
         self.exe = find_executable("sfi.py")
-        self.process = QProcess()
+        if not self.exe:
+            print "FATAL.. Could not locate binary sfi.py - not much we can do without that"
 
-        self.finished = pyqtSignal()
-        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
-                     self.finished)
+    def isRunning(self):
+        return self.process.state() != QProcess.NotRunning
+
+    def processStandardOutput(self):
+        output = self.process.readAllStandardOutput()
+        if self.debug:
+            print output
+
+    def processStandardError(self):
+        print self.process.readAllStandardError()
+
+    def processFinished(self):
+        if self.process.exitStatus() == QProcess.CrashExit:
+            print self.readOutput()
+            print "Process exited with errors:",
+            err = self.process.error()
+            if err == QProcess.FailedToStart:
+                print "FailedToStart"
+            elif err == QProcess.Crashed:
+                print "Crashed"
+            elif err == QProcess.Timedout:
+                print "Timedout"
+            elif err == QProcess.WriteError:
+                print "WriteError"
+            elif err == QProcess.ReadError:
+                print "ReadError"
+            elif err == QProcess.UnknownError:
+                print "UnknownError"
+        self.trace_end()
+        self.emit(SIGNAL("finished()"))
 
     def __getRSpec(self, mgr):
         slice = config.getSlice()
@@ -38,7 +77,7 @@ class SfiProcess(QObject):
         except:
             pass
         args = ["-u", config.getUser(), "-a", config.getAuthority(), 
-                "-r", config.registry(), "-s", mgr, "resources", 
+                "-r", config.getRegistry(), "-s", mgr, "resources", 
                 "-o", filename, slice]
 
         self.__init_command(args)
@@ -46,21 +85,42 @@ class SfiProcess(QObject):
         return filename
 
     def getRSpecFromSM(self):
-        return self.__getRSpec(config.slicemgr())
+        return self.__getRSpec(config.getSlicemgr())
 
     def getRSpecFromAM(self):
-        return self.__getRSpec(config.aggmgr())
+        return self.__getRSpec(config.getAggmgr())
 
     def getRecord(self, hrn):
         args = ["-u", config.getUser(), "-a", config.getAuthority(), 
-                "-r", config.registry(), "-s", config.slicemgr(), "show", hrn]
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "show", hrn]
         self.__init_command(args)
         self.start()
 
+    def applyRSpec(self, rspec):
+        filename = config.getSliceRSpecFile() + "_new"
+        rspec.save(filename)
+        args = ["-u", config.getUser(), "-a", config.getAuthority(), 
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", 
+                config.getSlice(), filename]
+        self.__init_command(args)
+        self.start()
+        return filename
+
     def start(self):
+        self.trace_command()
         self.process.start(self.exe, self.args)
 
     def readOutput(self):
         if self.process.state() == QProcess.NotRunning:
             return self.process.readAll()
 
+    def trace_command (self):
+        if config.verbose:
+            self._trace=time.time()
+            command = "%s %s" % (self.exe, self.args.join(" "))
+            print time.strftime('%M:%S'),'Invoking',command
+
+    def trace_end (self):
+        if config.verbose:
+            command = "%s %s" % (self.exe, self.args.join(" "))
+            print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'