Changeset 929 for branches/1.1


Ignore:
Timestamp:
07/31/13 16:27:18 (7 years ago)
Author:
ramonb
Message:
  • revert
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1/jobarchived/jobarchived.py

    r928 r929  
    932932        """
    933933
    934         global ARCHIVE_DATASOURCES
    935 
    936934        jobinfo = { }
    937935
     
    10271025                    debug_msg( 10, 'jobinfo for job %s has changed' %jobid )
    10281026            else:
    1029                 debug_msg( 10, 'new job %s' %jobid )
     1027                debug_msg( 1, 'new job %s' %jobid )
    10301028
    10311029                if not jobid in self.jobs_to_store:
     
    11461144        """Find all existing clusters in archive dir"""
    11471145
    1148         global ARCHIVE_DATASOURCES
    1149 
    11501146        archive_dir    = check_dir(ARCHIVE_PATH)
    11511147
     
    11771173                    self.clusters[ clustername ] = RRDHandler( self.config, clustername )
    11781174
    1179                     debug_msg( 9, 'Found cluster dir: %s' %( clustername ) )
    1180 
    1181         debug_msg( 9, "Found "+str(len(self.clusters.keys()))+" cluster dirs" )
     1175        debug_msg( 9, "Found "+str(len(self.clusters.keys()))+" clusters" )
    11821176
    11831177    def startElement( self, name, attrs ):
    11841178        """Memorize appropriate data from xml start tags"""
    11851179
    1186         global ARCHIVE_DATASOURCES
    1187 
    11881180        if name == 'GANGLIA_XML':
    11891181
     
    12091201                self.clusters[ self.clusterName ] = RRDHandler( self.config, self.clusterName )
    12101202
    1211             debug_msg( 10, ' |-Cluster found: %s' %( self.clusterName ) )
     1203                debug_msg( 10, ' |-Cluster found: %s' %( self.clusterName ) )
    12121204
    12131205        elif name == 'HOST' and self.clusterName in ARCHIVE_DATASOURCES:     
     
    12461238                self.clusters[ self.clusterName ].memMetric( self.hostName, myMetric )
    12471239
    1248                 debug_msg( 9, 'added metric %s from host %s to cluster %s' %( myMetric['name'], self.hostName, self.clusterName ) )
    12491240                debug_msg( 11, ' | | |-metric: %s:%s' %( myMetric['name'], myMetric['val'] ) )
    12501241
     
    16791670    """Class for handling RRD activity"""
    16801671
     1672    myMetrics   = { }
     1673    lastStored  = { }
     1674    timeserials = { }
     1675    slot = None
    16811676
    16821677    def __init__( self, config, cluster ):
     
    16891684        self.config  = config
    16901685        self.slot    = threading.Lock()
    1691         self.myMetrics   = { }
    1692         self.lastStored  = { }
    1693         self.timeserials = { }
    16941686
    16951687        if MODRRDTOOL:
Note: See TracChangeset for help on using the changeset viewer.