# HG changeset patch # User drewp # Date 1580288715 28800 # Node ID 732e30c509d6f9f5d9d4740cebb1aa49eb3caa47 # Parent 391140f53dfdefa49724831edd6f12d5dbc74731 collector: add /graphlist, plus logging updates Ignore-this: 6afc4f2573d9dd0d3299e7a676a723e7 darcs-hash:ae7ec37d77a49e5f8626a4d60095b08edd931a2c diff -r 391140f53dfd -r 732e30c509d6 service/collector/sse_collector.py --- 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), diff -r 391140f53dfd -r 732e30c509d6 service/collector/tasks.py --- 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