changeset 693:be2fbdbdf549

collector: add /graphlist, plus logging updates Ignore-this: 6afc4f2573d9dd0d3299e7a676a723e7
author drewp@bigasterisk.com
date Wed, 29 Jan 2020 01:05:15 -0800
parents b1258d252ef0
children 925bc4137c93
files service/collector/sse_collector.py service/collector/tasks.py
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/service/collector/sse_collector.py	Wed Jan 29 01:04:09 2020 -0800
+++ b/service/collector/sse_collector.py	Wed Jan 29 01:05:15 2020 -0800
@@ -423,17 +423,22 @@
         except Exception:
             import traceback; traceback.print_exc()
             raise
-              
+
+class GraphList(cyclone.web.RequestHandler):
+    def get(self) -> None:
+        self.write(json.dumps(config['streams']))
+
 if __name__ == '__main__':
     arg = docopt("""
     Usage: sse_collector.py [options]
 
     -v   Verbose
+    -i  Info level only
     """)
-    
-    if arg['-v']:
+
+    if arg['-v'] or arg['-i']:
         enableTwistedLog()
-        log.setLevel(logging.DEBUG)
+        log.setLevel(logging.DEBUG if arg['-v'] else logging.INFO)
         defer.setDebugging(True)
 
 
@@ -448,7 +453,8 @@
                     "path": "static", "default_filename": "index.html"}),
                 (r'/static/(.*)',cyclone.web.StaticFileHandler, {"path": "static"}),
                 (r'/state', State),
-                (r'/graph/(.*)', PatchSink),
+                (r'/graph/', GraphList),
+                (r'/graph/(.+)', PatchSink),
                 (r'/stats/(.*)', StatsHandler, {'serverName': 'collector'}),
             ],
             graphClients=graphClients),
--- a/service/collector/tasks.py	Wed Jan 29 01:04:09 2020 -0800
+++ b/service/collector/tasks.py	Wed Jan 29 01:05:15 2020 -0800
@@ -19,7 +19,7 @@
 
 @task(pre=[build_image])
 def local_run(ctx):
-    ctx.run(f'docker run --rm -it -p {PORT}:{PORT} --net=host --cap-add SYS_PTRACE --dns 10.2.0.1 --dns-search bigasterisk.com -v `pwd`/static:/opt/static {TAG_x86} python3 sse_collector.py -v', pty=True)
+    ctx.run(f'docker run --rm -it -p {PORT}:{PORT} --net=host --cap-add SYS_PTRACE --dns 10.2.0.1 --dns-search bigasterisk.com -v `pwd`/static:/opt/static {TAG_x86} python3 sse_collector.py -i', pty=True)
 
 #local_run_strace: build_image
 #	docker run --rm -it -p ${PORT}:${PORT} \ --name=$(JOB)_local \ --net=host \ --cap-add SYS_PTRACE \ ${TAG} \ strace -f -tts 200 python3 /mnt/sse_collector.py -v