From 8ba434151c5811d114cb2ce3e61c8f95bd098d24 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 17 May 2016 21:59:11 -0700 Subject: [PATCH] Improve error message consistency. --- src/Archive/Redirect.coffee | 4 ++-- src/Monitoring/ThreadUpdater.coffee | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index 0d540ed87..37a68a152 100644 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -50,8 +50,8 @@ Redirect = urls.push url if url load = (i) -> -> - fail = (action, msg) -> new Notice 'warning', "Error #{action} archive data from #{urls[i]}\n#{msg}", 20 - return fail 'fetching', (if @status then "#{@status} #{@statusText}" else 'Connection Error') unless @status is 200 + fail = (action, msg) -> new Notice 'warning', "Error #{action} archive data from\n#{urls[i]}\n#{msg}", 20 + return fail 'fetching', (if @status then "Error #{@statusText} (#{@status})" else 'Connection Error') unless @status is 200 try response = JSON.parse @response catch err diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index 4ae272f7a..5d86742ee 100644 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/src/Monitoring/ThreadUpdater.coffee @@ -162,7 +162,7 @@ ThreadUpdater = ThreadUpdater.set 'status', '' ThreadUpdater.setInterval() unless req.status - ThreadUpdater.set 'status', 'Connection Failed', 'warning' + ThreadUpdater.set 'status', 'Connection Error', 'warning' else if req.status isnt 304 ThreadUpdater.set 'status', "#{req.statusText} (#{req.status})", 'warning'