You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/05/02 21:29:27 UTC
qpid-dispatch git commit: DISPATCH-302: Pass command line options to
console proxy
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 00b47f15b -> 2a0e82fcb
DISPATCH-302: Pass command line options to console proxy
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/2a0e82fc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/2a0e82fc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/2a0e82fc
Branch: refs/heads/master
Commit: 2a0e82fcb6f5527f1e6718c6152f3d8841994c17
Parents: 00b47f1
Author: Ernest Allen <ea...@redhat.com>
Authored: Mon May 2 15:29:08 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Mon May 2 15:29:08 2016 -0400
----------------------------------------------------------------------
console/stand-alone/plugin/js/qdrPlugin.js | 2 +-
python/qpid_dispatch_internal/management/agent.py | 17 ++++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2a0e82fc/console/stand-alone/plugin/js/qdrPlugin.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrPlugin.js b/console/stand-alone/plugin/js/qdrPlugin.js
index 3d14f72..c287342 100644
--- a/console/stand-alone/plugin/js/qdrPlugin.js
+++ b/console/stand-alone/plugin/js/qdrPlugin.js
@@ -46,7 +46,7 @@ var QDR = (function(QDR) {
*
* The top level path to this plugin's partials
*/
- QDR.srcBase = "../dispatch/plugin/";
+ QDR.srcBase = "plugin/";
QDR.templatePath = QDR.srcBase + "html/";
QDR.cssPath = QDR.srcBase + "css/";
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/2a0e82fc/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 1c91dc3..3c1dbc2 100644
--- a/python/qpid_dispatch_internal/management/agent.py
+++ b/python/qpid_dispatch_internal/management/agent.py
@@ -414,20 +414,23 @@ class ConsoleEntity(EntityAdapter):
#required
host = listener.attributes['addr']
port = listener.attributes['port']
- wsport = self.attributes['wsport']
#optional
+ wsport = self.attributes.get('wsport')
home = self.attributes.get('home')
args = self.attributes.get('args')
pargs = []
pargs.append(self.attributes['proxy'])
- pargs.append(str(self.attributes['wsport']))
- pargs.append("%s:%s" % (host, port))
- if home:
- pargs.append("--web")
- pargs.append(self.attributes['home'])
if args:
- pargs.append(args)
+ # Replace any $port|$host|$wsport|$home
+ dargs = {'$port': port, '$host': host}
+ if wsport:
+ dargs['$wsport'] = wsport
+ if home:
+ dargs['$home'] = home
+ for k,v in dargs.iteritems():
+ args = args.replace(k,str(v))
+ pargs += args.split()
#run the external program
Popen(pargs)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org