X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=cd98a314f8f1a94634977129610dd6afc58a0713;hp=cd24f9a9d870c7e3a1844d96ef422f724aff9e61;hb=95e0d8d2ac7bc562d011faba71d8c0276cd31264;hpb=a66b375ceca1b5c2567659a5b2da806e9b9598ea

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index cd24f9a..cd98a31 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,9 +1,11 @@
 
 import os
+import sys
 import time
 
 from PyQt4.QtCore import *
 from sface.config import config
+from sface.xmlrpcwindow import XmlrpcTracker
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -19,8 +21,28 @@ class SfiProcess(QObject):
     def __init__(self, parent=None):
         QObject.__init__(self, parent)
 
+        env = QProcess.systemEnvironment()
+        env << "PYTHONPATH=%s" % ":".join(sys.path)
+        self.process = QProcess()
+        self.process.setEnvironment(env)
+        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
+                     self.processFinished)
+        
+        self.xmlrpctracker = XmlrpcTracker()
+        # in case self.output is read by the XmlrpcTracker before any
+        # readyReadStandardOutput signal
+        self.output = ''
+
+        self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
+                     self.processStandardOutput)
+        self.connect(self.process, SIGNAL("readyReadStandardError()"),
+                     self.processStandardError)
+
     def __init_command(self, args):
         self.args = QStringList()
+        if config.debug:
+            # this shows xmlrpc conversation, see sfi.py docs.
+            self.args << QString('-D')
         for arg in args:
             self.args << QString(arg)
 
@@ -28,12 +50,34 @@ class SfiProcess(QObject):
         if not self.exe:
             print "FATAL.. Could not locate binary sfi.py - not much we can do without that"
 
-        self.process = QProcess()
+    def isRunning(self):
+        return self.process.state() != QProcess.NotRunning
 
-        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
-                     self.processFinished)
+    def processStandardOutput(self):
+        output = self.process.readAllStandardOutput()
+        if config.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()"))
 
@@ -56,8 +100,8 @@ class SfiProcess(QObject):
     def getRSpecFromSM(self):
         return self.__getRSpec(config.getSlicemgr())
 
-    def getRSpecFromAM(self):
-        return self.__getRSpec(config.getAggmgr())
+#    def getRSpecFromAM(self):
+#        return self.__getRSpec(config.getAggmgr())
 
     def getRecord(self, hrn):
         args = ["-u", config.getUser(), "-a", config.getAuthority(), 
@@ -65,6 +109,16 @@ class SfiProcess(QObject):
         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)
@@ -77,9 +131,12 @@ class SfiProcess(QObject):
         if config.verbose:
             self._trace=time.time()
             command = "%s %s" % (self.exe, self.args.join(" "))
-            print time.strftime('%M:%S'),'Invoking',command
+            print time.strftime('%H:%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'
+#            command = "%s %s" % (self.exe, self.args.join(" "))
+            print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace)
+        if config.debug:
+            self.xmlrpctracker.getAndPrint(self.output)
+