Changeset 3627

Timestamp:

17/10/08 18:29:10 (3 months ago)

Author:

dmeyer

Message:

update signal handling for monitoring

Location:

trunk/beacon

Files:

• bin/beacon-search (modified) (2 diffs)
• src/server/monitor.py (modified) (2 diffs)

trunk/beacon/bin/beacon-search

@@ -143 +143 @@
         print
 
-def changed(result):
+def changed(result, details):
     print '\nBeacon query update:'
     print_results(result, details)
@@ -273 +273 @@
         result = yield kaa.beacon.query(**query)
         
+    t2 = time.time()
+    print_results(result, details)
+    if not isinstance(result.get(), (list, tuple)):
+        result = [ result.get() ]
+    print 'Query took %s seconds; %d results' % ((t2-t1), len(result))
     if not monitor:
-        t2 = time.time()
-        print_results(result, details)
-        if not isinstance(result.get(), (list, tuple)):
-            result = [ result.get() ]
-        print 'Query took %s seconds; %d results' % ((t2-t1), len(result))
         sys.exit(0)
-    else:
-        result.signals['changed'].connect(changed, result)
-        result.signals['progress'].connect(progress)
-        result.signals['up-to-date'].connect(uptodate)
-        result.monitor()
-
-    kaa.main.run()
-    sys.exit(0)
+    result.signals['changed'].connect(changed, result, details)
+    result.signals['progress'].connect(progress)
+    result.signals['up-to-date'].connect(uptodate)
+    result.monitor()
 
 if __name__ == '__main__':

trunk/beacon/src/server/monitor.py

@@ -233 +233 @@
             yield False
 
-        if not changed:
-            # no changes but send the 'changed' ipc to the client
-            self.notify_client('changed', False)
-            self._checking = False
-            yield False
-
         for pos, item in enumerate(changed):
             self.notify_client('progress', pos+1, len(changed), item.url)
@@ -261 +255 @@
             OneShotTimer(self.check, []).start(0.5)
         self.notify_client('checked')
+        self.notify_client('changed', True)
         self._checking = False
         yield False