X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=cd98a314f8f1a94634977129610dd6afc58a0713;hp=8e5e37106c9779b8e555b9032b126354fb56940b;hb=0bf5b56105bd3447ee68abaeb85fb56c2ebc9670;hpb=901a23960c9e613e4c2e7e1895aab7fdb5662631

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 8e5e371..cd98a31 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -5,6 +5,7 @@ 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"""
@@ -20,9 +21,18 @@ 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()"),
@@ -30,6 +40,9 @@ class SfiProcess(QObject):
 
     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)
 
@@ -87,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(), 
@@ -118,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)
+