DISPATCH-455 Catch socket errors to prevent popups in FF
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/52b2d8d4 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/52b2d8d4 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/52b2d8d4 Branch: refs/heads/master Commit: 52b2d8d468b20fc7e84992cbb541795dfe722265 Parents: b34136d Author: Ernest Allen <[email protected]> Authored: Fri Jul 22 11:47:50 2016 -0400 Committer: Ernest Allen <[email protected]> Committed: Fri Jul 22 11:47:50 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/plugin/js/dispatchPlugin.js | 5 + .../src/main/webapp/plugin/js/qdrService.js | 11 +- .../src/main/webapp/plugin/lib/rhea-min.js | 100 ++----------------- 3 files changed, 19 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/52b2d8d4/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js index aa16f91..09597e2 100644 --- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js +++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js @@ -196,6 +196,11 @@ var QDR = (function(QDR) { QDRChartService.init(); // initialize charting service after we are connected }); if (settings && settings.autostart) { + QDRService.addDisconnectAction( function () { + $location.path(QDR.pluginRoot + "/connect"); + $location.replace(); + $rootScope.$apply(); + }) QDRService.addConnectAction(function() { if ($location.path().startsWith(QDR.pluginRoot)) { var lastLocation = localStorage[QDR.LAST_LOCATION]; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/52b2d8d4/console/hawtio/src/main/webapp/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrService.js b/console/hawtio/src/main/webapp/plugin/js/qdrService.js index 6454b42..2a8aaad 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrService.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrService.js @@ -782,7 +782,6 @@ var QDR = (function(QDR) { } var onDisconnect = function () { //QDR.log.warn("Disconnected"); - self.errorText = "Connection failed" self.connectionError = true; stop(); self.executeDisconnectActions(); @@ -798,9 +797,10 @@ var QDR = (function(QDR) { }); } catch (e) { - onDisconnect();; + QDR.log.debug("exception caught on connect") + self.errorText = "Connection failed" + onDisconnect(); } - if (!self.connectionError) { connection.on('connection_open', function (context) { QDR.log.debug("connection_opened") @@ -809,11 +809,14 @@ var QDR = (function(QDR) { okay.sender = false; }) connection.on('disconnected', function (context) { + QDR.log.debug("connection disconnected") + self.errorText = "Unable to connect" onDisconnect(); }) connection.on('connection_close', function (context) { - onDisconnect(); + QDR.log.debug("connection closed") self.errorText = "Disconnected" + onDisconnect(); }) var sender = connection.open_sender(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
