X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=examples%2Fallwatcher.py;h=c78d689fe9d18588791bbfb8cf15b4f8e5617aa0;hb=dbcac620b62e16f9e4b7a763e1400f2f3a79b285;hp=6c549b47fb13bbacd819f007d938ee7b2b3a9cfe;hpb=edf3beda420d3a2c66d6ef8fe9b5e45a76d052b9;p=osm%2FN2VC.git

diff --git a/examples/allwatcher.py b/examples/allwatcher.py
index 6c549b4..c78d689 100644
--- a/examples/allwatcher.py
+++ b/examples/allwatcher.py
@@ -1,19 +1,31 @@
-import asyncio
+"""
+This example:
 
-from juju.client.connection import Connection
-from juju.client import watcher
+1. Connects to the current model
+2. Starts an AllWatcher
+3. Prints all changes received from the AllWatcher
+4. Runs forever (kill with Ctrl-C)
 
+"""
+import asyncio
+import logging
 
-loop = asyncio.get_event_loop()
-conn = loop.run_until_complete(Connection.connect_current())
+from juju.client.connection import Connection
+from juju.client import client
+from juju import loop
 
 
 async def watch():
-    allwatcher = watcher.AllWatcher()
-    allwatcher.connect(conn)
+    conn = await Connection.connect_current()
+    allwatcher = client.AllWatcherFacade.from_connection(conn)
     while True:
         change = await allwatcher.Next()
         for delta in change.deltas:
             print(delta.deltas)
 
-loop.run_until_complete(watch())
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG)
+    # Run loop until the process is manually stopped (watch will loop
+    # forever).
+    loop.run(watch())