Chris Smith 8 роки тому
джерело
коміт
8f173625dd
3 змінених файлів з 6 додано та 1 видалено
  1. 1
    1
      monitor.py
  2. 2
    0
      report.py
  3. 3
    0
      updater.py

+ 1
- 1
monitor.py Переглянути файл

26
       elif event['Action'] == 'die':
26
       elif event['Action'] == 'die':
27
         self._remove(event['id'])
27
         self._remove(event['id'])
28
       else:
28
       else:
29
-        print('Monitor.monitor(): unexpected event %s' % event['Action'])
29
+        print('Monitor.monitor(): unexpected event %s' % event['Action'], flush=True)
30
 
30
 
31
 
31
 
32
   def _add(self, infos):
32
   def _add(self, infos):

+ 2
- 0
report.py Переглянути файл

14
 updater = Updater(args.etcd_host, args.etcd_port, args.etcd_prefix)
14
 updater = Updater(args.etcd_host, args.etcd_port, args.etcd_prefix)
15
 monitor = Monitor(args.name, updater.add_containers, updater.remove_containers)
15
 monitor = Monitor(args.name, updater.add_containers, updater.remove_containers)
16
 
16
 
17
+print('Starting updater...', flush=True)
18
+
17
 updater.wipe()
19
 updater.wipe()
18
 monitor.monitor()
20
 monitor.monitor()
19
 
21
 

+ 3
- 0
updater.py Переглянути файл

39
   def add_containers(self, new_containers):
39
   def add_containers(self, new_containers):
40
     for container in new_containers:
40
     for container in new_containers:
41
       name = container['name']
41
       name = container['name']
42
+      print('Adding container %s' % name)
42
       self._write_obj('/containers/%s' % name, container)
43
       self._write_obj('/containers/%s' % name, container)
43
       for k, v in container['labels'].items():
44
       for k, v in container['labels'].items():
44
         self._write('/labels/%s/%s' % (k, name), v)
45
         self._write('/labels/%s/%s' % (k, name), v)
51
   def remove_containers(self, old_containers):
52
   def remove_containers(self, old_containers):
52
     for container in old_containers:
53
     for container in old_containers:
53
       name = container['name']
54
       name = container['name']
55
+      print('Removing container %s' % name)
54
       self._delete('/containers/%s' % name)
56
       self._delete('/containers/%s' % name)
55
       for k, v in container['labels'].items():
57
       for k, v in container['labels'].items():
56
         self._delete('/labels/%s/%s' % (k, name))
58
         self._delete('/labels/%s/%s' % (k, name))
60
     self._notify_update()
62
     self._notify_update()
61
 
63
 
62
   def _notify_update(self):
64
   def _notify_update(self):
65
+    print('Update completed', flush=True)
63
     self._write('/_updated', time.time())
66
     self._write('/_updated', time.time())
64
 
67
 

Завантаження…
Відмінити
Зберегти