X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=lib%2Fdaemon.py;h=f34159e9255318e64eaaae2506eb961cb0486e80;hb=99a31b0c6a30bad2cb2b8c27a748a1f25a89c107;hp=f99517da38e74a0bdddb6f4909b9be856b1bfe8c;hpb=4ec31b9fe97f1d057a24a0b639baf4fc02a49000;p=electrum-nvc.git diff --git a/lib/daemon.py b/lib/daemon.py index f99517d..f34159e 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -28,18 +28,21 @@ from network import Network from util import print_msg, print_stderr from simple_config import SimpleConfig +DAEMON_PORT=8001 class NetworkProxy(threading.Thread): # connects to daemon # sends requests, runs callbacks - def __init__(self, config = {}): + def __init__(self, config=None): + if config is None: + config = {} # Do not use mutables as default arguments! threading.Thread.__init__(self) self.daemon = True self.config = SimpleConfig(config) if type(config) == type({}) else config self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.daemon_port = config.get('daemon_port', 8000) + self.daemon_port = config.get('daemon_port', DAEMON_PORT) self.message_id = 0 self.unanswered_requests = {} self.subscriptions = {} @@ -307,7 +310,7 @@ class NetworkServer: self.network = network self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self.daemon_port = config.get('daemon_port', 8001) + self.daemon_port = config.get('daemon_port', DAEMON_PORT) self.server.bind(('', self.daemon_port)) self.server.listen(5) self.server.settimeout(1)