Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: service_checker: correctly return an error in case of timeouts
......................................................................
service_checker: correctly return an error in case of timeouts
Bug: T116739
Change-Id: I16f32e57bfa6da0ff583080fc115f92faad2e413
---
M modules/service/files/checker.py
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Mobrovac: Looks good to me, but someone else must approve
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/service/files/checker.py b/modules/service/files/checker.py
index 79aa527..d9a3aff 100755
--- a/modules/service/files/checker.py
+++ b/modules/service/files/checker.py
@@ -265,8 +265,10 @@
method=self.method
)
except CheckServiceError as e:
- return ('CRITICAL', "Could not fetch url {}: {}".format(
- url, e))
+ self.status = 'CRITICAL'
+ self.msg = "Could not fetch url {}: {}".format(
+ url, e)
+ return
# Response status
if r.status != self.resp_status:
--
To view, visit https://gerrit.wikimedia.org/r/249388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16f32e57bfa6da0ff583080fc115f92faad2e413
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
