Fixed networkProxy, IceGrid/admin, metrics test failures

1 files changed, 6 insertions, 4 deletions

diff --git a/scripts/NetworkProxy.py b/scripts/NetworkProxy.py
index e33bc19414a..9b31ab614dd 100644
--- a/scripts/NetworkProxy.py
+++ b/scripts/NetworkProxy.py
@@ -7,14 +7,13 @@
 #
 # **********************************************************************
 
-import sys, os, threading, socket, select, atexit
+import sys, os, threading, socket, select
 
 class InvalidRequest(Exception): pass
 
 class BaseConnection(threading.Thread):
     def __init__(self, socket, remote):
         threading.Thread.__init__(self)
-        self.setDaemon(True)
         self.socket = socket
         self.remote = remote
         self.remoteSocket = None
@@ -27,6 +26,8 @@ class BaseConnection(threading.Thread):
         pass
 
     def close(self):
+        if self.closed:
+            return
         self.closed = True
         try:
             if self.socket:
@@ -81,8 +82,6 @@ class BaseProxy(threading.Thread):
         self.socket = None
         self.failed = None
         self.connections = []
-        atexit.register(self.terminate)
-        self.setDaemon(True)
         self.start()
         with self.cond:
             while not self.socket and not self.failed:
@@ -126,6 +125,7 @@ class BaseProxy(threading.Thread):
         for c in self.connections:
             try:
                 c.close()
+                c.join()
             except Exception as ex:
                 print(ex)
 
@@ -137,6 +137,8 @@ class BaseProxy(threading.Thread):
         finally:
             connectToSelf.close()
 
+        self.join()
+
 class SocksConnection(BaseConnection):
 
     def request(self, s):