summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-06-08 18:28:35 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-06-08 18:28:35 -0300
commitd003072047756ecf9d83f62a07a52af4da7bf206 (patch)
tree3d16a0e111f1e124dea36974c64772b349af1f71
parent5b2f5e39754942c0f75344c6087a4282c8def418 (diff)
[feat] adapt to new events api on common
- Related: #6359
-rw-r--r--changes/feature_adapt-to-new-events-on-common1
-rw-r--r--src/launcher.py9
2 files changed, 5 insertions, 5 deletions
diff --git a/changes/feature_adapt-to-new-events-on-common b/changes/feature_adapt-to-new-events-on-common
new file mode 100644
index 0000000..bc89f77
--- /dev/null
+++ b/changes/feature_adapt-to-new-events-on-common
@@ -0,0 +1 @@
+o Adapt to new events API on leap.common. Related to #6359.
diff --git a/src/launcher.py b/src/launcher.py
index 66a53f0..9802a38 100644
--- a/src/launcher.py
+++ b/src/launcher.py
@@ -6,8 +6,7 @@ import threading
import ConfigParser
from leap.bitmask.app import start_app as bitmask_client
-from leap.common.events import server, signal
-from leap.common.events import events_pb2 as proto
+from leap.common.events import server, emit, catalog
import tuf.client.updater
@@ -76,8 +75,8 @@ class TUF(threading.Thread):
shutil.rmtree(self.update_path)
shutil.move(self.dest_path, self.update_path)
filepath = sorted([f['filepath'] for f in updated_targets])
- signal(proto.UPDATER_NEW_UPDATES,
- content=", ".join(filepath))
+ emit(catalog.UPDATER_NEW_UPDATES,
+ content=", ".join(filepath))
print "Updates ready: ", filepath
return
except NotImplemented as e:
@@ -118,7 +117,7 @@ class TUF(threading.Thread):
if __name__ == "__main__":
- server.ensure_server(port=8090)
+ server.ensure_server()
config = ConfigParser.ConfigParser()
config.read("launcher.conf")