Fix: Watcher was missing the node name

Author: setaou

moneta/moneta.py

@@ -147,7 +147,7 @@ def run():
     if args.watcher:
         # Run in Watcher mode
         logger.debug('Starting in Watcher mode')
-        watcher = MonetaWatcher()
+        watcher = MonetaWatcher(local_config['nodename'])
         watcher.run()
         sys.exit(0)
 

moneta/watcher.py

@@ -25,13 +25,14 @@
 class MonetaWatcher(object):
     """ Watch a process and send updates back to the manager. """
 
-    def __init__(self):
+    def __init__(self, nodename):
         """ Constructor """
 
         self.task = None
         self.taskconfig = {}
         self.processid = None
         self.manager = None
+        self.nodename = nodename
 
         self.report = {}
         self.exec_greenlet = None
@@ -82,6 +83,7 @@ def handle_clean_exit():
         # Initial report
         start = datetime.utcnow().replace(tzinfo = dateutil.tz.tzutc())
         self.report.update({
+            "node": self.nodename,
             "task": self.task,
             "pid": getpid(),
             "start_time": start,