Handle removing

README.md

@@ -31,6 +31,9 @@ The following command line arguments are available:
   --name (default: unknown) name of the host running docker
 ```
 
+The script will update etcd as soon as it launches, and then
+monitor for docker events and apply the relevant updates.
+
 ## Schema
 
 The script stores values relating to containers, labels, hosts and
@@ -65,7 +68,6 @@ networks in etcd:
 
 * The docker node is deleted when the script starts, so you can't run multiple
   copies on multiple hosts
-* Containers that are stopped aren't removed
 * There's no way to get notified when the script has finished, rather than
   mid-update
 

report.py

@@ -35,6 +35,22 @@ def add_containers(new_containers):
   etcd_put(etcd_client, prefix + '/hosts', host_index)
 
 
+def remove_containers(old_containers):
+  global containers, host_index, label_index, network_index
+  for container in old_containers:
+    name = container['name']
+    del containers[name]
+    etcd_client.delete(prefix + '/containers/' + name, recursive=True)
+
+    for k, v in container['labels'].items():
+      del label_index[k][name]
+      etcd_client.delete(prefix + '/labels/' + k + '/' + name)
+    for k, v in container['net']['addr'].items():
+      del network_index[k][name]
+      etcd_client.delete(prefix + '/networks/' + k + '/' + name)
+    etcd_client.delete(prefix + '/hosts/' + host + '/' + name)
+
+
 parser = argparse.ArgumentParser()
 parser.add_argument('--name', help='Name of this docker host', default='unknown')
 parser.add_argument('--etcd-port', type=int, help='Port to connect to etcd on', default=2379)
@@ -42,7 +58,7 @@ parser.add_argument('--etcd-host', help='Host to connect to etcd on', default='e
 parser.add_argument('--etcd-prefix', help='Prefix to use when adding keys to etcd', default='/docker')
 args = parser.parse_args()
 
-monitor = Monitor(args.name, add_containers, lambda x: None) 
+monitor = Monitor(args.name, add_containers, remove_containers)
 etcd_client = etcd.Client(host=args.etcd_host, port=args.etcd_port)
 prefix = args.etcd_prefix
 host = args.name