Changeset 55 for trunk

Timestamp:

04/08/05 15:16:43 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

Multiple storethreads is of no use: Both threads will do the exact same thing
instead of sharing the work.

• Would need to thread the rrd-commands, will require more coding

File:

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

trunk/daemon/togad.py

@@ -23 +23 @@
 # 7  = daemon threading
 #
-DEBUG_LEVEL = 8
+DEBUG_LEVEL = 7
 
 # Where is the gmetad.conf located
@@ -63 +63 @@
 STORE_TIMEOUT = 360
 
-# Number of storing threads
-#
-STORE_THREADS = 1
 """
 This is TOrque-GAnglia's data Daemon
@@ -352 +349 @@
 
                 xmlthread = threading.Thread( None, self.processXML, 'xmlthread' )
-
-                storethreads = [ ]
-
-                for num in range( int( STORE_THREADS ) ):
-
-                        storethreads.append( threading.Thread( None, self.storeMetrics, 'storethread' ) )
+                storethread = threading.Thread( None, self.storeMetrics, 'storethread' )
 
                 while( 1 ):
@@ -369 +361 @@
                                 xmlthread.start()
 
-                        for storethread in storethreads:
-
-                                mythread = storethreads.index( storethread )
-
-                                if not storethread.isAlive():
-
-                                        # Store metrics every .. sec
-
-                                        # threaded call to: self.storeMetrics()
-                                        #
-                                        storethreads[ mythread ] = threading.Thread( None, self.storeMetrics, 'storethread' )
-                                        storethreads[ mythread ].start()
+                        if not storethread.isAlive():
+                                # Store metrics every .. sec
+
+                                # threaded call to: self.storeMetrics()
+                                #
+                                storethread = threading.Thread( None, self.storeMetrics, 'storethread' )
+                                storethread.start()
                 
                         # Just sleep a sec here, to prevent daemon from going mad. We're all threads here anyway
@@ -392 +379 @@
                 # Store metrics somewhere between every 60 and 180 seconds
                 #
-                #STORE_INTERVAL = random.randint( 360, 640 )
-                STORE_INTERVAL = 60
+                STORE_INTERVAL = random.randint( 360, 640 )
 
                 storethread = threading.Thread( None, self.storeThread, 'storemetricthread' )