Changeset 946 for branches/1.1/jobmond/jobmond.py

Timestamp:

01/17/14 11:05:42 (10 years ago)

Author:

ramonb

Message:

jobmond/jobmond.py:

• reuse Gmetric classes instead of recreating them everytime
• cleanup sockets if destroyed
• see #176

File:

• branches/1.1/jobmond/jobmond.py (modified) (4 diffs)

branches/1.1/jobmond/jobmond.py

@@ -697 +697 @@
                 sys.exit( 1 )
 
+        self.gmetric_send_instances = { }
+
+
+    def __del__( self ):
+
+        for send_instance in self.gmetric_send_instances:
+
+            del send_instance
+
     def checkGmetricVersion( self ):
 
@@ -757 +766 @@
                 debug_msg( 10, printTime() + ' ' + metric_debug)
 
-                gm = Gmetric( c_ip, c_port )
-
-                gm.send( str( metricname ), str( metricval ), str( self.dmax ), valtype, units )
+                if not self.gmetric_send_instances.has_key( (c_ip, c_port) ):
+
+                    self.gmetric_send_instances[ (c_ip, c_port) ] = Gmetric( c_ip, c_port )
+
+                self.gmetric_send_instances[ (c_ip, c_port) ].send( str( metricname ), str( metricval ), str( self.dmax ), valtype, units )
 
         elif GMETRIC_TARGET:
@@ -770 +781 @@
             debug_msg( 10, printTime() + ' ' + metric_debug)
 
-            gm = Gmetric( GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT )
-
-            gm.send( str( metricname ), str( metricval ), str( self.dmax ), valtype, units )
+            if not self.gmetric_send_instances.has_key( (GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT) ):
+
+                self.gmetric_send_instances[ (GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT) ] = Gmetric( GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT )
+
+            self.gmetric_send_instances[ (GMETRIC_TARGET_HOST, GMETRIC_TARGET_PORT) ].send( str( metricname ), str( metricval ), str( self.dmax ), valtype, units )
 
         else:
@@ -1983 +1996 @@
         self.tmax       = 60
 
+    def __del__( self ):
+
+        self.socket.close()
+
     def checkHostProtocol( self, ip ):