Ema has submitted this change and it was merged.
Change subject: varnishlog4.py: log errors in execute()
......................................................................
varnishlog4.py: log errors in execute()
We should log errors set by python-varnishapi instead of ignoring them.
Bug: T137114
Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
---
M modules/varnish/files/varnishlog4.py
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/varnish/files/varnishlog4.py
b/modules/varnish/files/varnishlog4.py
index f3fed5d..433e4d3 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -55,6 +55,7 @@
limitations under the License.
"""
+import sys
import time
import signal
import inspect
@@ -93,6 +94,10 @@
"""Loop and execute callback"""
while self.keep_running:
ret = self.vap.Dispatch(self.vap_callback)
+ if self.vap.error:
+ sys.stderr.write("Error in execute(): %s\n" % self.vap.error)
+ self.vap.error = ''
+
if ret == 0:
time.sleep(0.01)
--
To view, visit https://gerrit.wikimedia.org/r/293123
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
