Changeset 355 for trunk/jobmond

Timestamp:

05/03/07 15:09:25 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• close gmetric pipe after checking version
• more code cleanup

File:

• trunk/jobmond/jobmond.py (modified) (10 diffs)

trunk/jobmond/jobmond.py

@@ -200 +200 @@
 
 class DataProcessor:
+
         """Class for processing of data"""
 
@@ -205 +206 @@
 
         def __init__( self, binary=None ):
+
                 """Remember alternate binary location if supplied"""
 
@@ -234 +236 @@
 
                         if incompatible:
-                                debug_msg( 0, 'Gmetric version not compatible, pls upgrade to at least 3.0.1' )
+
+                                debug_msg( 0, 'Gmetric version not compatible, please upgrade to at least 3.0.1' )
                                 sys.exit( 1 )
 
         def checkGmetricVersion( self ):
+
                 """
                 Check version of gmetric is at least 3.0.1
@@ -247 +251 @@
                 incompatible    = 0
 
-                for line in os.popen( self.binary + ' --version' ).readlines():
+                gfp             = os.popen( self.binary + ' --version' )
+                lines           = gfp.readlines()
+
+                gfp.close()
+
+                for line in lines:
 
                         line = line.split( ' ' )
 
-                        if len( line ) == 2 and str(line).find( 'gmetric' ) != -1:
+                        if len( line ) == 2 and str( line ).find( 'gmetric' ) != -1:
                         
-                                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
+                                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
 
                                 if version_major < 3:
@@ -284 +293 @@
 
         def multicastGmetric( self, metricname, metricval, valtype='string' ):
+
                 """Call gmetric binary and multicast"""
 
@@ -324 +334 @@
 
         def printJobs( self, jobs ):
+
                 """Print a jobinfo overview"""
 
@@ -335 +346 @@
 
         def printJob( self, jobs, job_id ):
+
                 """Print job with job_id from jobs"""
 
@@ -344 +356 @@
 
         def daemon( self ):
+
                 """Run as daemon forever"""
 
@@ -380 +393 @@
 
         def run( self ):
+
                 """Main thread"""
 
@@ -507 +521 @@
                         self.dp.multicastGmetric( 'MONARCH-JOB-' + jobid + '-' + str(metric_increment), jobattrs)
 
-class PbsDataGatherer(DataGatherer):
+class PbsDataGatherer( DataGatherer ):
 
         """This is the DataGatherer for PBS and Torque"""