diff options
| author | Yoann QUERET <yoann@queret.net> | 2015-10-02 16:34:35 +0200 |
|---|---|---|
| committer | Yoann QUERET <yoann@queret.net> | 2015-10-02 16:34:35 +0200 |
| commit | 845af2d9c4abb7669594444d293b3c7072b1e161 (patch) | |
| tree | 7ce740eb2b315a72fa1e4ae202ba61953f1c3e0a /gui | |
| parent | b4b9c78e834ce7a4602bfa81dbb3077abe213752 (diff) | |
| download | dabmux-845af2d9c4abb7669594444d293b3c7072b1e161.tar.gz dabmux-845af2d9c4abb7669594444d293b3c7072b1e161.tar.bz2 dabmux-845af2d9c4abb7669594444d293b3c7072b1e161.zip | |
Make config.json output fully JSON compatible
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/muxconfig.py | 4 | ||||
| -rwxr-xr-x | gui/odr-dabmux-gui.py | 6 |
2 files changed, 4 insertions, 6 deletions
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('/') |