diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2015-06-17 23:54:35 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-06-17 23:54:35 +0900 |
| commit | 9285be68f1d349383d05493b86a3326c0e5630ef (patch) | |
| tree | b0a5ae7d72a73910b81a7626f0eee94a2564a3ca | |
| parent | 8d9d76b09394afa8e2d485f4464f5d109e436e00 (diff) | |
| download | aclog-9285be68f1d349383d05493b86a3326c0e5630ef.tar.gz | |
web: about/status: WorkerManager.alive? should catch Aclog::Exceptions::WorkerConnectionError
| -rw-r--r-- | app/models/worker_manager.rb | 2 | ||||
| -rw-r--r-- | app/views/about/status.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/worker_manager.rb b/app/models/worker_manager.rb index 25c4884..6eac369 100644 --- a/app/models/worker_manager.rb +++ b/app/models/worker_manager.rb @@ -4,7 +4,7 @@ class WorkerManager class << self def alive? !!client - rescue Aclog + rescue Aclog::Exceptions::WorkerConnectionError false end diff --git a/app/views/about/status.html.haml b/app/views/about/status.html.haml index c8b2149..b62faf9 100644 --- a/app/views/about/status.html.haml +++ b/app/views/about/status.html.haml @@ -31,4 +31,4 @@ %p Worker for group #{current_user.account.worker_number} is currently down. - else .alert.alert-danger - %strong Couldn't communicate with the collector service. + %strong The collector service is down. |