thomas - r7254 - in flumotion/branches/platform-3: . flumotion/monitor/nagios

[flumotion-commit at lists.fluendo.com]

Author: thomas
Date: Wed Aug 20 16:07:53 2008
New Revision: 7254

Log:
	* flumotion/monitor/nagios/Makefile.am:
	* flumotion/monitor/nagios/main.py:
	* flumotion/monitor/nagios/log.py (added):
	  Add implementation of flumotion-nagios log recent which can
	  check if a given string was logged recently.
	  Backport of [7252].



Added:
   flumotion/branches/platform-3/flumotion/monitor/nagios/log.py
      - copied unchanged from r7252, /flumotion/trunk/flumotion/monitor/nagios/log.py
Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/monitor/nagios/Makefile.am
   flumotion/branches/platform-3/flumotion/monitor/nagios/main.py

Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Wed Aug 20 16:07:53 2008
@@ -1,3 +1,12 @@
+2008-08-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/monitor/nagios/Makefile.am:
+	* flumotion/monitor/nagios/main.py:
+	* flumotion/monitor/nagios/log.py (added):
+	  Add implementation of flumotion-nagios log recent which can
+	  check if a given string was logged recently.
+	  Backport of [7252].
+
 2008-07-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/configure/uninstalled.py.in:

Modified: flumotion/branches/platform-3/flumotion/monitor/nagios/Makefile.am
==============================================================================
--- flumotion/branches/platform-3/flumotion/monitor/nagios/Makefile.am	(original)
+++ flumotion/branches/platform-3/flumotion/monitor/nagios/Makefile.am	Wed Aug 20 16:07:53 2008
@@ -4,6 +4,7 @@
 
 flumotion_PYTHON =	\
 	__init__.py	\
+	log.py		\
 	util.py		\
 	process.py	\
 	main.py

Modified: flumotion/branches/platform-3/flumotion/monitor/nagios/main.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/monitor/nagios/main.py	(original)
+++ flumotion/branches/platform-3/flumotion/monitor/nagios/main.py	Wed Aug 20 16:07:53 2008
@@ -28,7 +28,7 @@
 from flumotion.common import common, errors, planet, log
 from flumotion.admin import connections, admin
 
-from flumotion.monitor.nagios import util, process
+from flumotion.monitor.nagios import util, process, log as nlog
 
 __version__ = "$Rev: 6125 $"
 
@@ -224,7 +224,7 @@
     usage = "%prog %command"
     description = "Run Flumotion-related Nagios checks."
 
-    subCommandClasses = [Manager, process.ProcessCommand]
+    subCommandClasses = [Manager, process.ProcessCommand, nlog.Log]
 
     def addOptions(self):
         self.parser.add_option('-v', '--version',