From 5b9948f7090485be182c691283028c61464eea45 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Wed, 8 Jun 2016 22:58:34 -0700
Subject: [PATCH] Omit the connection warning if the socket connected at least
 once before

---
 www/js/callbacks.js | 10 ++++++++++
 www/js/data.js      |  1 +
 2 files changed, 11 insertions(+)

diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 0794b40c..caa6da21 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -6,6 +6,7 @@ Callbacks = {
 
     /* fired when socket connection completes */
     connect: function() {
+        HAS_CONNECTED_BEFORE = true;
         SOCKETIO_CONNECT_ERROR_COUNT = 0;
         $("#socketio-connect-error").remove();
         socket.emit("joinChannel", {
@@ -1034,6 +1035,7 @@ Callbacks = {
 
     partitionChange: function (socketConfig) {
         window.socket.disconnect();
+        HAS_CONNECTED_BEFORE = false;
         ioServerConnect(socketConfig);
         setupCallbacks();
     }
@@ -1059,6 +1061,14 @@ setupCallbacks = function() {
     }
 
     socket.on("connect_error", function (error) {
+        // If the socket has connected at least once during this
+        // session and now gets a connect error, it is likely because
+        // the server is down temporarily and not because of any configuration
+        // issue.  Therefore, omit the warning message about refreshing.
+        if (HAS_CONNECTED_BEFORE) {
+            return;
+        }
+
         SOCKETIO_CONNECT_ERROR_COUNT++;
         if (SOCKETIO_CONNECT_ERROR_COUNT >= 3 &&
                 $("#socketio-connect-error").length === 0) {
diff --git a/www/js/data.js b/www/js/data.js
index ab9a5fce..1d348208 100644
--- a/www/js/data.js
+++ b/www/js/data.js
@@ -66,6 +66,7 @@ var FILTER_FROM = 0;
 var FILTER_TO = 0;
 var NO_STORAGE = typeof localStorage == "undefined" || localStorage === null;
 var SOCKETIO_CONNECT_ERROR_COUNT = 0;
+var HAS_CONNECTED_BEFORE = false;
 
 function getOpt(k) {
     var v = NO_STORAGE ? readCookie(k) : localStorage.getItem(k);