commit 8e9f30f3e12b59d2a432bd0306f08a9825d42f5e
author Neels Hofmeyr <nhofmeyr@sysmocom.de> Mon Feb 27 01:17:22 2017 +0100
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> Mon Mar 06 15:31:08 2017 +0100
tree 8fb66f92113a7134eb766670d876c39619ba8772
parent e34932099218d7b8c4e00629242551edced2e2fb

tcp_debug: don't abort when socket can't be removed

It appears that during some error conditions, the socket will not be in the tcp
socket debug tracking list, and on top of an exception this barfs as well.
Let's not care about the tcp debug list and avoid confusing error messages.

Change-Id: I8daa317fed8fc7e720dccb70fd5f7fc74fde423f

osmopy/obscvty.py

diff --git a/osmopy/obscvty.py b/osmopy/obscvty.py
index bbf6e45..f5c85fb 100755
--- a/osmopy/obscvty.py
+++ b/osmopy/obscvty.py
@@ -74,7 +74,10 @@
             return
 
         if debug_tcp_sockets:
-            VTYInteract.all_sockets.remove(self.socket)
+            try:
+                VTYInteract.all_sockets.remove(self.socket)
+            except ValueError:
+                pass
             print "Socket: closing %s:%d %r (%d sockets open)" % (
                     self.host, self.port, self.socket,
                     len(VTYInteract.all_sockets))