Changeset 431 for trunk/jobmond/jobmond.py

Timestamp:

07/08/07 22:58:56 (17 years ago)

Author:

bastiaans

Message:

Makefile:

• updated rpm-jobmond

jobmond/jobmond.py:

• fix to pidfile arg parsing
• fix to native gmetric unit handling

pkg/rpm/init.d/jobmond:

• updated as a proper redhat based init script

pkg/rpm/jobmonarch-jobmond.spec:

• call chkconfig in preun not postun

File:

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

trunk/jobmond/jobmond.py

@@ -42 +42 @@
 def processArgs( args ):
 
-        SHORT_L         = 'hc:'
-        LONG_L          = [ 'help', 'config=' ]
+        SHORT_L         = 'p:hc:'
+        LONG_L          = [ 'help', 'config=', 'pidfile=' ]
 
         global PIDFILE
@@ -894 +894 @@
 GMETRIC_DEFAULT_HOST    = '127.0.0.1'
 GMETRIC_DEFAULT_PORT    = '8649'
+GMETRIC_DEFAULT_UNITS   = ''
 
 class Gmetric:
@@ -920 +921 @@
 
                 self.hostport   = ( host, int( port ) )
-                self.type       = GMETRIC_DEFAULT_TYPE
-                self.unitstr    = ''
                 self.slopestr   = 'both'
                 self.tmax       = 60
@@ -938 +937 @@
                         return 'udp'
 
-        def send( self, name, value, dmax, type = '', units = '' ):
+        def send( self, name, value, dmax, typestr = '', units = '' ):
 
                 if len( units ) == 0:
-                        units           = self.unitstr
-                if len( type ) == 0:
-                        typestr         = self.type
+                        units           = GMETRIC_DEFAULT_UNITS
+                if len( typestr ) == 0:
+                        typestr         = GMETRIC_DEFAULT_TYPE
 
                 msg             = self.makexdr( name, value, typestr, units, self.slopestr, self.tmax, dmax )