diff --git a/proxywatchd.py b/proxywatchd.py index 8c5f6b8..905664e 100644 --- a/proxywatchd.py +++ b/proxywatchd.py @@ -2135,7 +2135,6 @@ class Proxywatchd(): stats_data['queue_size'] = self.job_queue.qsize() stats_data['checktype'] = ','.join(config.watchd.checktypes) stats_data['checktypes'] = config.watchd.checktypes - stats_data['use_ssl'] = config.watchd.use_ssl stats_data['profiling'] = getattr(config.args, 'profile', False) if hasattr(config, 'args') else False stats_data['pass_rate'] = try_div(self.stats.passed, elapsed) diff --git a/static/dashboard.js b/static/dashboard.js index f408c30..bbe417a 100644 --- a/static/dashboard.js +++ b/static/dashboard.js @@ -262,16 +262,17 @@ function renderLeaderboard(id, data, nameKey, valKey, limit) { function update(d) { $('dot').className = 'dot'; $('statusTxt').textContent = 'Live'; - // SSL badge (main test mode when enabled) + // SSL badge (show if 'ssl' checktype is enabled) var sslBadge = $('sslBadge'); if (sslBadge) { - sslBadge.style.display = d.use_ssl ? 'inline-block' : 'none'; + var hasSSL = d.checktypes && d.checktypes.indexOf('ssl') >= 0; + sslBadge.style.display = hasSSL ? 'inline-block' : 'none'; } // Check type badges (multiple supported) var ctContainer = $('checktypeBadges'); if (ctContainer) { var checktypes = (d.checktype || 'unknown').split(','); - var badgeColors = {judges: 'blu', head: 'grn', ssl: 'cyn', irc: 'pur', unknown: 'dim'}; + var badgeColors = {judges: 'blu', head: 'grn', ssl: 'cyn', irc: 'pur', tor: 'mag', unknown: 'dim'}; var html = ''; checktypes.forEach(function(ct) { ct = ct.trim();