|
@ -198,10 +198,10 @@ class Network(util.DaemonThread): |
|
|
with self.lock: |
|
|
with self.lock: |
|
|
self.callbacks[event].append(callback) |
|
|
self.callbacks[event].append(callback) |
|
|
|
|
|
|
|
|
def trigger_callback(self, event, params=()): |
|
|
def trigger_callback(self, event, *args): |
|
|
with self.lock: |
|
|
with self.lock: |
|
|
callbacks = self.callbacks[event][:] |
|
|
callbacks = self.callbacks[event][:] |
|
|
[callback(*params) for callback in callbacks] |
|
|
[callback(*args) for callback in callbacks] |
|
|
|
|
|
|
|
|
def read_recent_servers(self): |
|
|
def read_recent_servers(self): |
|
|
if not self.config.path: |
|
|
if not self.config.path: |
|
@ -294,11 +294,10 @@ class Network(util.DaemonThread): |
|
|
return value |
|
|
return value |
|
|
|
|
|
|
|
|
def notify(self, key): |
|
|
def notify(self, key): |
|
|
value = self.get_status_value(key) |
|
|
|
|
|
if key in ['status', 'updated']: |
|
|
if key in ['status', 'updated']: |
|
|
self.trigger_callback(key) |
|
|
self.trigger_callback(key) |
|
|
else: |
|
|
else: |
|
|
self.trigger_callback(key, (value,)) |
|
|
self.trigger_callback(key, self.get_status_value(key)) |
|
|
|
|
|
|
|
|
def get_parameters(self): |
|
|
def get_parameters(self): |
|
|
host, port, protocol = deserialize_server(self.default_server) |
|
|
host, port, protocol = deserialize_server(self.default_server) |
|
|