Changeset 81 for trunk

Timestamp:

04/18/05 10:44:30 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• New threading model for XML processing working
• Changed determination of job ending; assume ending time = last_reported + poll_interval

File:

• trunk/daemon/togad.py (modified) (3 diffs)

trunk/daemon/togad.py

@@ -187 +187 @@
                 sys.stdin.close()
                 sys.stdout.close()
-                #sys.stderr.close()
+                sys.stderr.close()
 
                 os.open('/dev/null', 0)
@@ -287 +287 @@
 
                                 self.jobAttrs[ jobid ]['status'] = 'F'
-                                self.jobAttrs[ jobid ]['stop_timestamp'] = jobinfo['reported']
+                                self.jobAttrs[ jobid ]['stop_timestamp'] = str( int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] ) )
 
         def jobinfoChanged( self, jobattrs, jobid, jobinfo ):
@@ -1071 +1071 @@
         """Program startup"""
 
-        #myTProcessor = TorqueXMLProcessor()
+        myTProcessor = TorqueXMLProcessor()
+        myTProcessor.run()
+
+        sys.exit( 1 )
+
         myGProcessor = GangliaXMLProcessor()
 
         if DAEMONIZE:
-                #torquexmlthread = threading.Thread( None, myTProcessor.daemon, 'tprocxmlthread' )
+                torquexmlthread = threading.Thread( None, myTProcessor.daemon, 'tprocxmlthread' )
                 gangliaxmlthread = threading.Thread( None, myGProcessor.daemon, 'gprocxmlthread' )
         else:
-                #torquexmlthread = threading.Thread( None, myTProcessor.run, 'tprocxmlthread' )
+                torquexmlthread = threading.Thread( None, myTProcessor.run, 'tprocxmlthread' )
                 gangliaxmlthread = threading.Thread( None, myGProcessor.run, 'gprocxmlthread' )
 
-        #torquexmlthread.start()
-        gangliaxmlthread.start()
+        torquexmlthread.start()
+        #gangliaxmlthread.start()
+
+# Global functions
 
 def check_dir( directory ):