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 2017/01/03 15:09:33 UTC
qpid-dispatch git commit: DISPATCH-600 Use correct protocol
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 427836291 -> 3a20b5055
DISPATCH-600 Use correct protocol
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/3a20b505
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/3a20b505
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/3a20b505
Branch: refs/heads/master
Commit: 3a20b50554f5def325bcd27b2c834f8c3f7007dd
Parents: 4278362
Author: Ernest Allen <ea...@redhat.com>
Authored: Tue Jan 3 10:09:13 2017 -0500
Committer: Ernest Allen <ea...@redhat.com>
Committed: Tue Jan 3 10:09:13 2017 -0500
----------------------------------------------------------------------
console/stand-alone/plugin/js/dispatchPlugin.js | 2 +-
console/stand-alone/plugin/js/qdrList.js | 4 ++--
console/stand-alone/plugin/js/qdrService.js | 16 ++++++++++------
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a20b505/console/stand-alone/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/dispatchPlugin.js b/console/stand-alone/plugin/js/dispatchPlugin.js
index 7949ceb..40b86e9 100644
--- a/console/stand-alone/plugin/js/dispatchPlugin.js
+++ b/console/stand-alone/plugin/js/dispatchPlugin.js
@@ -211,7 +211,7 @@ var QDR = (function(QDR) {
$location.search("org", "overview")
}
- QDRService.testConnect({address: host, port: port, reconnect: true}, 10000, function (e) {
+ QDRService.testConnect({address: host, port: port}, 10000, function (e) {
if (e.error) {
QDR.log.debug("failed to auto-connect to " + host + ":" + port)
// the connect page should rneder
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a20b505/console/stand-alone/plugin/js/qdrList.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrList.js b/console/stand-alone/plugin/js/qdrList.js
index 4695b4a..0aad6a1 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -57,8 +57,8 @@ var QDR = (function(QDR) {
op: 'UPDATE',
title: "Update this attribute",
isValid: function () {
- QDR.log.debug("isValid UPDAATE? " + this.op)
- console.dump($scope.operations)
+ //QDR.log.debug("isValid UPDAATE? " + this.op)
+ //console.dump($scope.operations)
return $scope.operations.indexOf(this.op) > -1
}
},
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/3a20b505/console/stand-alone/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js
index a9d038b..44128bc 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -925,23 +925,26 @@ console.dump(e)
testConnect: function (options, timeout, callback) {
clearTimeout(self.connectionTimer)
var connection;
- var reconnect = angular.isDefined(options.reconnect) ? options.reconnect : true
- QDR.log.debug("testConnect called with reconnect " + reconnect)
+ var reconnect = angular.isDefined(options.reconnect) ? options.reconnect : false
var baseAddress = options.address + ':' + options.port;
- var protocol = $location.protocol() + "://"
+ var protocol = "ws"
+ if ($location.protocol() === "https")
+ protocol = "wss"
+ QDR.log.debug("testConnect called with reconnect " + reconnect + " using " + protocol + " protocol")
try {
var ws = self.rhea.websocket_connect(WebSocket);
connection = self.rhea.connect({
- connection_details: ws(protocol + baseAddress, ["binary"]),
+ connection_details: ws(protocol + "://" + baseAddress, ["binary"]),
reconnect: reconnect,
properties: {
console_identifier: 'Dispatch console'
}
});
} catch (e) {
- QDR.log.debug("exception caught on test connect")
- self.errorText = "Connection failed"
+ QDR.log.debug("exception caught on test connect " + e)
+ self.errorText = "Connection failed "
callback({error: e})
+ return
}
self.connectionTimer = setTimeout(function () {
callback({error: "timedout"})
@@ -1046,6 +1049,7 @@ console.dump(e)
var connection;
if (!options.connection) {
QDR.log.debug("rhea.connect was not passed an existing connection")
+ options.reconnect = true
self.testConnect(options, 10000, connectionCallback)
} else {
QDR.log.debug("rhea.connect WAS passed an existing connection")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org