Changeset 69

Timestamp:

04/14/05 15:51:10 (18 years ago)

Author:

bastiaans

Message:

plugin/togap.py:

• Misc bugfixes

File:

• trunk/plugin/togap.py (modified) (9 diffs)

trunk/plugin/togap.py

@@ -3 +3 @@
 # Specify debugging level here;
 #
-DEBUG_LEVEL = 10
+DEBUG_LEVEL = 0
 
 # Wether or not to run as a daemon in background
@@ -52 +52 @@
                         sys.exit( 1 )
 
-                #incompatible = self.checkGmetricVersion()
-                incompatible = 0
+                incompatible = self.checkGmetricVersion()
 
                 if incompatible:
@@ -69 +68 @@
                         line = line.split( ' ' )
 
-                        if len( line ) == 2 and line.find( 'gmetric' ) != -1:
+                        if len( line ) == 2 and str(line).find( 'gmetric' ) != -1:
                         
-                                gmetric_version = line[1]
-
-                                version_major = int( gemtric_version.split( '.' )[0] )
-                                version_minor = int( gemtric_version.split( '.' )[1] )
-                                version_patch = int( gemtric_version.split( '.' )[2] )
+                                gmetric_version = line[1].split( '\n' )[0]
+
+                                version_major = int( gmetric_version.split( '.' )[0] )
+                                version_minor = int( gmetric_version.split( '.' )[1] )
+                                version_patch = int( gmetric_version.split( '.' )[2] )
 
                                 incompatible = 0
@@ -106 +105 @@
 
                 print cmd
-                #os.system( cmd )
+                os.system( cmd )
 
 class PBSDataGatherer:
@@ -158 +157 @@
                 joblist = self.pq.getjobs()
 
-                cur_time = time.time()
+                self.cur_time = time.time()
 
                 jobs_processed = [ ]
 
                 for name, attrs in joblist.items():
-
-                        print attrs
 
                         job_id = name.split( '.' )[0]
@@ -201 +198 @@
                         myAttrs['status'] = status
                         myAttrs['start_timestamp'] = start_timestamp
-                        myAttrs['reported_timestamp'] = str( int( cur_time ) )
+                        myAttrs['reported_timestamp'] = str( int( self.cur_time ) )
                         myAttrs['nodes'] = nodeslist
                         myAttrs['domain'] = string.join( socket.getfqdn().split( '.' )[1:], '.' )
@@ -208 +205 @@
                                 jobs[ job_id ] = myAttrs
 
-                                self.printJob( jobs, job_id )
+                                #self.printJob( jobs, job_id )
 
                                 debug_msg( 10, printTime() + ' job %s state changed' %(job_id) )
@@ -216 +213 @@
         def submitJobData( self, jobs ):
                 """Submit job info list"""
+
+                self.dp.multicastGmetric( 'TOGA-HEARTBEAT', str( int( self.cur_time ) ) )
 
                 # Now let's spread the knowledge
@@ -287 +286 @@
                 """Check if val + text size is not above 1400 (max msg size)"""
 
+                # Max frame size of a udp datagram is 1500 bytes
+                # removing misc header and gmetric stuff leaves about 1400 bytes
+                #
                 if len( val + text ) > 1400:
                         return 1