always store latest data from GetSlivers in /var/log/getslivers.txt, not only when...

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index bb0a2ab..304db42 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -39,9 +39,15 @@ parser.add_option('-k', '--session', action='store', dest='session', default='/e
 parser.add_option('-p', '--period', action='store', dest='period', default=600, help='Polling interval (sec)')
 parser.add_option('-r', '--random', action='store', dest='random', default=301, help='Range for additional random polling interval (sec)')
 parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log')
+parser.add_option('-P', '--path', action='store', dest='path', default='/usr/share/NodeManager/plugins', help='Path to plugins directory')
 parser.add_option('-m', '--module', action='store', dest='module', default='', help='run a single module among '+' '.join(known_modules))
 (options, args) = parser.parse_args()
 
+# Deal with plugins directory
+if os.path.exists(options.path):
+    sys.path.append(options.path)
+    known_modules += [i[:-3] for i in os.listdir(options.path) if i.endswith(".py") and (i[:-3] not in known_modules)]
+
 modules = []
 
 def GetSlivers(plc):
@@ -53,8 +59,7 @@ def GetSlivers(plc):
         logger.log_exc()
         #  XXX So some modules can at least boostrap.
         data = {}
-    if (options.verbose):
-        logger.log_slivers(data)
+    logger.log_slivers(data)
     # Set i2 ip list for nodes in I2 nodegroup.
     try: net.GetSlivers(plc, data)
     except: logger.log_exc()