Repository: qpid-dispatch Updated Branches: refs/heads/master 077d053ff -> 2f253d4c8
DISPATCH-806 - Added warning log message to indicate the the console entity is deprecated and use http:yes on the listener instead. Also made a couple of attributes on the console entity as required. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/2f253d4c Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/2f253d4c Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/2f253d4c Branch: refs/heads/master Commit: 2f253d4c8091136429159f3c853e50aeea6f6f01 Parents: 077d053 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Thu Sep 28 10:51:41 2017 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Thu Sep 28 10:51:41 2017 -0400 ---------------------------------------------------------------------- python/qpid_dispatch/management/qdrouter.json | 2 ++ python/qpid_dispatch_internal/management/agent.py | 1 + python/qpid_dispatch_internal/management/config.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2f253d4c/python/qpid_dispatch/management/qdrouter.json ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index 5811982..fd78c96 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -1394,10 +1394,12 @@ }, "proxy": { "type": "string", + "required": true, "description": "The full path to the proxy program to run." }, "home": { "type": "string", + "required": true, "description": "The full path to the html/css/js files for the console." }, "args": { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2f253d4c/python/qpid_dispatch_internal/management/agent.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py index 81c70d6..cd5ec7d 100644 --- a/python/qpid_dispatch_internal/management/agent.py +++ b/python/qpid_dispatch_internal/management/agent.py @@ -407,6 +407,7 @@ class ConsoleEntity(EntityAdapter): def create(self): # if a named listener is present, use its host:port + self._agent.log(LOG_WARNING, "Console entity is deprecated: Use http:yes on listener entity instead") name = self.attributes.get('listener') if name: listeners = self._agent.find_entity_by_type("listener") http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2f253d4c/python/qpid_dispatch_internal/management/config.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/config.py b/python/qpid_dispatch_internal/management/config.py index f921128..5ffa3c4 100644 --- a/python/qpid_dispatch_internal/management/config.py +++ b/python/qpid_dispatch_internal/management/config.py @@ -114,7 +114,7 @@ class Config(object): sections = self._parserawjson(source) if raw_json else self._parse(source) # Add missing singleton sections for et in self.get_config_types(): - if et.singleton and not [s for s in sections if s[0] == et.short_name]: + if et.singleton and not et.deprecated and not [s for s in sections if s[0] == et.short_name]: sections.append((et.short_name, {})) entities = [dict(type=self.schema.long_name(s[0]), **s[1]) for s in sections] self.schema.validate_all(entities) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org