From 45eac5835cbbb5f356fa1b5dae47e1fbf96dd040 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 18 Dec 2008 13:45:10 +0000
Subject: [PATCH] ganeti.http: Ignore ENOTCONN when shutting down the
connection
Reviewed-by: amishchenko
---
lib/http/__init__.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/http/__init__.py b/lib/http/__init__.py
index 7973b0fe1..dfb7a8962 100644
--- a/lib/http/__init__.py
+++ b/lib/http/__init__.py
@@ -387,7 +387,9 @@ def ShutdownConnection(poller, sock, close_timeout, write_timeout, msgreader,
except HttpSocketTimeout:
raise HttpError("Timeout while shutting down connection")
except socket.error, err:
- raise HttpError("Error while shutting down connection: %s" % err)
+ # Ignore ENOTCONN
+ if not (err.args and err.args[0] == errno.ENOTCONN):
+ raise HttpError("Error while shutting down connection: %s" % err)
def Handshake(poller, sock, write_timeout):
--
GitLab