From 3c51aa309f6ff0c38ee9d86c8a35b38cd4f6ac72 Mon Sep 17 00:00:00 2001 From: Yoann QUERET Date: Fri, 2 Oct 2015 15:32:21 +0200 Subject: Add ability to set socket host/port and mux host/port in argv --- gui/odr-dabmux-gui.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gui/odr-dabmux-gui.py') diff --git a/gui/odr-dabmux-gui.py b/gui/odr-dabmux-gui.py index caa4ea7..1d7a37c 100755 --- a/gui/odr-dabmux-gui.py +++ b/gui/odr-dabmux-gui.py @@ -31,7 +31,8 @@ from muxconfig import * from bottle import route, run, template, static_file, request import json -conf = ConfigurationHandler('localhost') +import argparse +import requests @route('/config') def config(): @@ -112,5 +113,17 @@ def stats_json(): def send_static(filename): return static_file(filename, root='./static') -run(host='localhost', port=8000, debug=True, reloader=True) + +if __name__ == '__main__': + # Get configuration file in argument + parser = argparse.ArgumentParser(description='management server for ODR-DabMux') + parser.add_argument('--host', default='127.0.0.1', help='socket host (default: 127.0.0.1)',required=False) + parser.add_argument('--port', default='8000', help='socket port (default: 8000)',required=False) + parser.add_argument('--mhost', default='127.0.0.1', help='mux host (default: 127.0.0.1)',required=False) + parser.add_argument('--mport', default='12720', help='mux port (default: 12720)',required=False) + cli_args = parser.parse_args() + + conf = ConfigurationHandler(cli_args.mhost, cli_args.mport) + + run(host=cli_args.host, port=int(cli_args.port), debug=True, reloader=False) -- cgit v1.2.3 From b4b9c78e834ce7a4602bfa81dbb3077abe213752 Mon Sep 17 00:00:00 2001 From: Yoann QUERET Date: Fri, 2 Oct 2015 16:10:27 +0200 Subject: Remove unused module --- gui/odr-dabmux-gui.py | 1 - 1 file changed, 1 deletion(-) (limited to 'gui/odr-dabmux-gui.py') diff --git a/gui/odr-dabmux-gui.py b/gui/odr-dabmux-gui.py index 1d7a37c..d0f2a27 100755 --- a/gui/odr-dabmux-gui.py +++ b/gui/odr-dabmux-gui.py @@ -32,7 +32,6 @@ from bottle import route, run, template, static_file, request import json import argparse -import requests @route('/config') def config(): -- cgit v1.2.3 From 845af2d9c4abb7669594444d293b3c7072b1e161 Mon Sep 17 00:00:00 2001 From: Yoann QUERET Date: Fri, 2 Oct 2015 16:34:35 +0200 Subject: Make config.json output fully JSON compatible --- gui/muxconfig.py | 4 +--- gui/odr-dabmux-gui.py | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'gui/odr-dabmux-gui.py') diff --git a/gui/muxconfig.py b/gui/muxconfig.py index b7161a7..62f182f 100644 --- a/gui/muxconfig.py +++ b/gui/muxconfig.py @@ -128,8 +128,6 @@ class ConfigurationHandler(object): server_info = self.zRead(b'info') config_info = self.zRead(b'getptree') - print("Config '%r'" % config_info) - self._server_version = json.loads(server_info)['service'] self._config = json.loads(config_info) @@ -142,7 +140,7 @@ class ConfigurationHandler(object): self._statistics = json.loads(stats_info)['values'] def get_full_configuration(self): - return json.dumps(self._config, indent=4) + return self._config def set_full_configuration(self, config_json): self.sock.send(b'setptree', flags=zmq.SNDMORE) diff --git a/gui/odr-dabmux-gui.py b/gui/odr-dabmux-gui.py index d0f2a27..5a3de76 100755 --- a/gui/odr-dabmux-gui.py +++ b/gui/odr-dabmux-gui.py @@ -63,7 +63,7 @@ def config_json_post(): return template('configeditor', version = conf.get_mux_version(), - config = conf.get_full_configuration(), + config = json.dumps(conf.get_full_configuration(), indent=4), message = successmessage) @route('/config.json', method="GET") @@ -73,8 +73,8 @@ def config_json_get(): conf.load() - return {'version': conf.get_mux_version(), - 'config': conf.get_full_configuration()} + return { 'version': conf.get_mux_version(), + 'config': conf.get_full_configuration() } @route('/') -- cgit v1.2.3 From 99e95b71ad1f389ff041ede3eae3009c9993a419 Mon Sep 17 00:00:00 2001 From: Yoann QUERET Date: Fri, 2 Oct 2015 16:48:59 +0200 Subject: Use space indentation insted tab --- gui/muxconfig.py | 32 ++++++++++++++++---------------- gui/odr-dabmux-gui.py | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gui/odr-dabmux-gui.py') diff --git a/gui/muxconfig.py b/gui/muxconfig.py index 62f182f..3888a6c 100644 --- a/gui/muxconfig.py +++ b/gui/muxconfig.py @@ -28,7 +28,7 @@ class General(object): def __init__(self, pt): ptree = pt['general'] for fieldname in [ - "nbframes", + "nbframes", "statsserverport", "writescca", "tist", @@ -46,7 +46,7 @@ class Service(object): self.name = name for fieldname in [ - "id", + "id", "label", "shortlabel", "pty", @@ -61,7 +61,7 @@ class Subchannel(object): def __init__(self, name, ptree): self.name = name for fieldname in [ - "type", + "type", "inputfile", "zmq-buffer", "zmq-prebuffering", @@ -106,22 +106,22 @@ class ConfigurationHandler(object): #self.sock.connect("tcp://{}:{}".format(self._host, self._port)) def zRead(self, key): - self._ctx = zmq.Context() + self._ctx = zmq.Context() self.sock = zmq.Socket(self._ctx, zmq.REQ) self.sock.setsockopt(zmq.LINGER, 0) self.sock.connect("tcp://{}:{}".format(self._host, self._port)) - self.sock.send(key) - - # use poll for timeouts: - poller = zmq.Poller() - poller.register(self.sock, zmq.POLLIN) - if poller.poll(5*1000): # 5s timeout in milliseconds - recv = self.sock.recv() - self.sock.close() - self._ctx.term() - return recv - else: - raise IOError("Timeout processing ZMQ request") + self.sock.send(key) + + # use poll for timeouts: + poller = zmq.Poller() + poller.register(self.sock, zmq.POLLIN) + if poller.poll(5*1000): # 5s timeout in milliseconds + recv = self.sock.recv() + self.sock.close() + self._ctx.term() + return recv + else: + raise IOError("Timeout processing ZMQ request") def load(self): """Load the configuration from the multiplexer and save it locally""" diff --git a/gui/odr-dabmux-gui.py b/gui/odr-dabmux-gui.py index 5a3de76..85098f8 100755 --- a/gui/odr-dabmux-gui.py +++ b/gui/odr-dabmux-gui.py @@ -114,15 +114,15 @@ def send_static(filename): if __name__ == '__main__': - # Get configuration file in argument - parser = argparse.ArgumentParser(description='management server for ODR-DabMux') - parser.add_argument('--host', default='127.0.0.1', help='socket host (default: 127.0.0.1)',required=False) - parser.add_argument('--port', default='8000', help='socket port (default: 8000)',required=False) - parser.add_argument('--mhost', default='127.0.0.1', help='mux host (default: 127.0.0.1)',required=False) - parser.add_argument('--mport', default='12720', help='mux port (default: 12720)',required=False) - cli_args = parser.parse_args() - - conf = ConfigurationHandler(cli_args.mhost, cli_args.mport) - - run(host=cli_args.host, port=int(cli_args.port), debug=True, reloader=False) + # Get configuration file in argument + parser = argparse.ArgumentParser(description='management server for ODR-DabMux') + parser.add_argument('--host', default='127.0.0.1', help='socket host (default: 127.0.0.1)',required=False) + parser.add_argument('--port', default='8000', help='socket port (default: 8000)',required=False) + parser.add_argument('--mhost', default='127.0.0.1', help='mux host (default: 127.0.0.1)',required=False) + parser.add_argument('--mport', default='12720', help='mux port (default: 12720)',required=False) + cli_args = parser.parse_args() + + conf = ConfigurationHandler(cli_args.mhost, cli_args.mport) + + run(host=cli_args.host, port=int(cli_args.port), debug=True, reloader=False) -- cgit v1.2.3