Commits

Anonymous committed fd6bd9d

updated ldap module (sladp) metric name. fixed a bug in ganglia-logtailer where it would exit incorrectly on missing state file.

  • Participants
  • Parent commits ba80c14

Comments (0)

Files changed (3)

File debian/changelog

+ganglia-logtailer (1.4) stable; urgency=low
+
+  * changing query name in the Slapd module, normalizing to qps instead of
+    total # queries
+  * fixing a bug in ganglia-logtailer where the lack of a state file causes an
+    sys.exit() to get caught by an exception handler and improperly reported
+
+ -- Ben Hartshorne <green@lindenlab.com>  Wed, 13 Jan 2010 13:15:52 -0800
+
 ganglia-logtailer (1.3-3) stable; urgency=low
 
   * caught error in the ApacheVHostLogtailer module - the class was

File src/SlapdLogtailer.py

             self.reset_state()
             self.lock.release()
             raise e
-        slapdquery = mydata['num_slapdquery']
+
+        # normalize to queries per second
+        slapdquery = mydata['num_slapdquery'] / check_time
         #print slapdquery
 
         # package up the data you want to submit
-        slapdquery_metric = GangliaMetricObject('numof_slapdqueries', slapdquery, units='slapdqueries')
+        slapdquery_metric = GangliaMetricObject('slapd_queries', slapdquery, units='qps')
         # return a list of metric objects
         return [ slapdquery_metric, ]
 

File src/ganglia-logtailer

                 end_locking(lockfile, logtail_lock_file)
                 sys.exit(0)
             input = os.popen(shell_tail)
+        except SystemExit, e:
+            raise
         except Exception, e:
             # note - there is no exception when shell-tailer doesn't exist.
             # I don't know when this exception will ever actually be triggered.