Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363193 )
Change subject: Add IPv6 support to all monitors, improve IdleConnection logging
......................................................................
Add IPv6 support to all monitors, improve IdleConnection logging
pybal (1.13.7) jessie-wikimedia; urgency=medium
* Add IPv6 support to all monitors (Bug: #T82747)
* Include IP and port information in IdleConnection logs
Bug: T82747
Bug: T154759
Change-Id: I7831e71092bc8a8e22669254ce316803b671dfc1
(cherry picked from commit ee5c3e846cfc1332615f134f417550b92ae20f35)
---
M debian/changelog
M pybal/monitors/idleconnection.py
2 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal
refs/changes/93/363193/1
diff --git a/debian/changelog b/debian/changelog
index 08150a7..f9ae90c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pybal (1.13.7) jessie-wikimedia; urgency=medium
+
+ * Add IPv6 support to all monitors (Bug: #T82747)
+ * Include IP and port information in IdleConnection logs
+
+ -- Emanuele Rocca <e...@wikimedia.org> Tue, 04 Jul 2017 15:50:28 +0200
+
pybal (1.13.6) jessie-wikimedia; urgency=medium
* Change the default behavior for LVS services from not being announced via
diff --git a/pybal/monitors/idleconnection.py b/pybal/monitors/idleconnection.py
index 42c556d..fd105dd 100644
--- a/pybal/monitors/idleconnection.py
+++ b/pybal/monitors/idleconnection.py
@@ -61,6 +61,9 @@
self.transport = getattr(connector, 'transport', None)
super(IdleConnectionMonitoringProtocol,
self).startedConnecting(connector)
+ def _report_prefix(self):
+ return "Connection to %s:%s" % (self.server.ip, self.server.port)
+
def clientConnectionFailed(self, connector, reason):
"""Called if the connection attempt failed"""
@@ -70,7 +73,7 @@
# Immediately set status to down
self._resultDown(reason.getErrorMessage())
- self.report("Connection failed.", level=logging.WARN)
+ self.report("%s failed." % self._report_prefix(), level=logging.WARN)
# Slowly reconnect
self.retry(connector)
@@ -89,7 +92,7 @@
# Connection lost in a non clean way. Immediately set status to
down
self._resultDown(reason.getErrorMessage())
- self.report("Connection lost.", level=logging.INFO)
+ self.report("%s lost." % self._report_prefix(), level=logging.INFO)
# Slowly reconnect
self.retry(connector)
@@ -113,7 +116,7 @@
# Reset reconnection delay
self.resetDelay()
- self.report("Connection established.")
+ self.report("%s established." % self._report_prefix())
def buildProtocol(self, addr):
"""
--
To view, visit https://gerrit.wikimedia.org/r/363193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7831e71092bc8a8e22669254ce316803b671dfc1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: 1.13
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
