loveisgrief/i2p-docker-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to cleanup unix socket

Browse Source 
#1 - Forward using iptables, pr0xy and custom DNS
This commit is contained in:
LoveIsGrief
2019-07-29 18:31:56 +02:00
parent d5538b1947
commit 5244b6d735
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contained/bin/fake-dns.py
View File

@@ -63,6 +63,9 @@ class UnixSocketServer(socketserver.ThreadingMixIn, socketserver.UnixStreamServe
""" """
def __init__(self, socket_path, request_handler_class, bind_and_activate=True): def __init__(self, socket_path, request_handler_class, bind_and_activate=True):
self._socket_path = socket_path
# Remove old socket if it's not being used
self._rm_socket()
super().__init__(socket_path, request_handler_class, bind_and_activate) super().__init__(socket_path, request_handler_class, bind_and_activate)
self.thread = threading.Thread(target=self.serve_forever) self.thread = threading.Thread(target=self.serve_forever)
self.thread.daemon = True self.thread.daemon = True
@@ -73,6 +76,17 @@ class UnixSocketServer(socketserver.ThreadingMixIn, socketserver.UnixStreamServe
def stop(self): def stop(self):
self.shutdown() self.shutdown()
self.server_close() self.server_close()
# Attempt to remove socket before exiting
self._rm_socket(True)
def _rm_socket(self, log_error=False):
try:
os.unlink(self._socket_path)
except Exception as e:
if log_error:
logging.getLogger("UnixSocketServer").warn(
"Couldn't remove unix socket: %s", e
)
def isAlive(self): def isAlive(self):
return self.thread.isAlive() return self.thread.isAlive()