summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason Kölker <jason@koelker.net>2016-01-27 04:20:55 +0000
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-01-30 22:18:45 +0900
commit636de20197aa2bd2d1ee8e9f6c6cd84d42b11270 (patch)
tree017061993d393e76ff3c53518a16f8854266be28
parentdf065f5bb15b26d177dfdaa43710c42db11aea9f (diff)
protocols/ovsdb: Handle accept() errors
An exception during server.accept() should not cause the server thread to terminate. Log the exception and continue instead. Signed-off-by: Jason Kölker <jason@koelker.net> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/services/protocols/ovsdb/manager.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/ryu/services/protocols/ovsdb/manager.py b/ryu/services/protocols/ovsdb/manager.py
index e406c44c..16ea08af 100644
--- a/ryu/services/protocols/ovsdb/manager.py
+++ b/ryu/services/protocols/ovsdb/manager.py
@@ -60,8 +60,13 @@ class OVSDB(app_manager.RyuApp):
return True
while True:
- # TODO(jkoelker) SSL Certificate Fingerprint check
- sock, client_address = server.accept()
+ try:
+ # TODO(jkoelker) SSL Certificate Fingerprint check
+ sock, client_address = server.accept()
+
+ except:
+ self.logger.exception('Error accepting connection')
+ continue
if not check(client_address[0]):
sock.shutdown(socket.SHUT_RDWR)