Changeset 70

Timestamp:

04/15/05 09:46:36 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Rewrote connection handling a bit error occured when gmetad was down
• Misc

File:

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

trunk/daemon/togad.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-from xml.sax import make_parser
+import xml.sax
 from xml.sax.handler import ContentHandler 
 import socket
@@ -172 +172 @@
                 if name == 'METRIC':
 
-                        metricname = attrss.get( 'NAME', "" )
+                        metricname = attrs.get( 'NAME', "" )
 
                         if metricname == 'TOGA-HEARTBEAT':
-
-                                if not self.heartbeat:
-                                        self.heartbeat = attrs.get( 'VAL', "" )
-
-                        if metricname.find( 'TOGA-JOB' ) != -1:
+                                self.heartbeat = attrs.get( 'VAL', "" )
+
+                        elif metricname.find( 'TOGA-JOB' ) != -1:
 
                                 job_id = name.split( 'TOGA-JOB-' )[1]
@@ -185 +183 @@
 
                                 valinfo = val.split( ' ' )
+                                print valinfo
 
                                 for myval in valinfo:
@@ -190 +189 @@
                                         name = valinfo.split( '=' )[0]
                                         value = valinfo.split( '=' )[1]
+
+                                        #if name == '
 
 class GangliaXMLHandler( ContentHandler ):
@@ -290 +291 @@
 
         s = None
+        fd = None
 
         def __init__( self, host, port ):
@@ -297 +299 @@
                 self.port = port
                 self.connect()
+                self.makeFileDescriptor()
 
         def connect( self ):
@@ -320 +323 @@
                         except socket.error, msg:
 
-                                self.s.close()
-                                self.s = None
+                                self.disconnect()
                                 continue
 
@@ -336 +338 @@
                 if self.s:
                         self.s.close()
+                        self.s.shutdown( 2 )
                         self.s = None
 
@@ -343 +346 @@
                 self.disconnect()
 
+        def reconnect( self ):
+                """Reconnect"""
+
+                if self.s:
+                        self.disconnect()
+
+                self.connect()
+
+        def makeFileDescriptor( self ):
+                """Make file descriptor that points to our socket connection"""
+
+                self.reconnect()
+
+                if self.s:
+                        self.fd = self.s.makefile( 'r' )
+
         def getFileObject( self ):
                 """Connect, and return a file object"""
 
-                if self.s:
-                        # Apearantly, only data is received when a connection is made
-                        # therefor, disconnect and connect
-                        #
-                        self.disconnect()
-                        self.connect()
-
-                return self.s.makefile( 'r' )
+                if self.fd:
+                        return self.fd
 
 class GangliaXMLProcessor:
@@ -364 +377 @@
 
                 self.myXMLGatherer = GangliaXMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
-                self.myParser = make_parser()   
-                self.myHandler = GangliaXMLHandler( self.config )
-                self.myParser.setContentHandler( self.myHandler )
+                self.myXMLSource = self.myXMLGatherer.getFileObject()
+                #self.myParser = make_parser()   
+                while( 1 ):
+                        print 'parse'
+                        xml.sax.parse( self.getFileObject(), TorqueXMLHandler() )
+                        print 'sleep'
+                        time.sleep( 1 )
+                #self.myHandler = GangliaXMLHandler( self.config )
+                #self.myHandler = TorqueXMLHandler( )
+                #self.myParser.setContentHandler( self.myHandler )
 
         def daemon( self ):
@@ -502 +522 @@
                 debug_msg( 7, self.printTime() + ' - parsethread(): started.' )
                 debug_msg( 7, self.printTime() + ' - parsethread(): Parsing XML..' )
-                ret = self.myParser.parse( self.myXMLGatherer.getFileObject() )
+                #ret = self.myParser.parse( self.myXMLGatherer.getFileObject() )
                 debug_msg( 7, self.printTime() + ' - parsethread(): Done parsing.' )
                 debug_msg( 7, self.printTime() + ' - parsethread(): finished.' )