Changeset 293 for trunk

Timestamp:

03/30/07 10:15:47 (17 years ago)

Author:

bastiaans

Message:

jobarchived/jobarchived.py:

• Fixed: XMLGatherer'ing
• Added XMLGather locking
• Removed conflicting XMLGatherer instances

File:

• trunk/jobarchived/jobarchived.py (modified) (8 diffs)

trunk/jobarchived/jobarchived.py

@@ -460 +460 @@
                 """Setup initial XML connection and handlers"""
 
-                self.myXMLGatherer      = XMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
+                #self.myXMLGatherer     = XMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
                 #self.myXMLSource       = self.myXMLGatherer.getFileObject()
                 self.myXMLSource        = XMLSource
@@ -654 +654 @@
                 self.clusters   = { }
                 debug_msg( 1, 'Checking existing toga rrd archive..' )
-                #self.gatherClusters()
+                self.gatherClusters()
                 debug_msg( 1, 'Check done.' )
 
@@ -785 +785 @@
         fd              = None
         data            = None
+        slot            = None
 
         # Time since the last update
@@ -801 +802 @@
                 """Store host and port for connection"""
 
-                self.host = host
-                self.port = port
+                self.host       = host
+                self.port       = port
+                self.slot       = threading.Lock()
 
                 self.retrieveData()
@@ -810 +812 @@
 
                 self.update_now = True
+
+                self.slot.acquire()
 
                 for res in socket.getaddrinfo( self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM ):
@@ -851 +855 @@
 
                         self.LAST_UPDATE        = time.time()
+
+                self.slot.release()
 
                 self.update_now = False
@@ -929 +935 @@
                 self.config             = GangliaConfigParser( GMETAD_CONF )
 
-                self.myXMLGatherer      = XMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
+                #self.myXMLGatherer     = XMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] ) 
                 #self.myXMLSource       = self.myXMLGatherer.getFileObject()
                 self.myXMLSource        = XMLSource
@@ -1048 +1054 @@
                 my_data = self.myXMLSource.getData()
 
+                #print my_data
+
                 try:
                         xml.sax.parseString( my_data, self.myXMLHandler, self.myXMLError )