Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBenjamin Neff <benjamin@coding4coffee.ch>2022-07-24 18:22:41 +0300
committerBenjamin Neff <benjamin@coding4coffee.ch>2022-07-24 18:22:41 +0300
commita661b0b608ce901f053421578dad815fd7c34002 (patch)
treecc2ecd378caa36227bcbab82fba8ebc8bae2a1ae /app
parent429a47d64d7753f14be454a519d198ca53ee7c7a (diff)
parent646685b42cd4cf14f6431633ef1b9f5c2d80ccfc (diff)
Merge branch 'next-minor' into develop
Diffstat (limited to 'app')
-rw-r--r--app/models/pod.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/pod.rb b/app/models/pod.rb
index c64bf4ce2..08692f280 100644
--- a/app/models/pod.rb
+++ b/app/models/pod.rb
@@ -114,7 +114,7 @@ class Pod < ApplicationRecord
def update_from_result(result)
self.status = status_from_result(result)
update_offline_since
- logger.warn "OFFLINE #{result.failure_message}" if offline?
+ logger.warn "#{uri} OFFLINE: #{result.failure_message}" if offline?
attributes_from_result(result)
touch(:checked_at)
@@ -125,7 +125,7 @@ class Pod < ApplicationRecord
def attributes_from_result(result)
self.ssl ||= result.ssl
- self.error = result.failure_message[0..254] if result.error?
+ self.error = result.error? ? result.failure_message[0..254] : nil
self.software = result.software_version[0..254] if result.software_version.present?
self.response_time = result.rt
end