commit a7f601c1121f467de22cd024d543672980533a2d
author stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu Feb 09 13:54:42 2017 +0100
committer stevenvanrossem <steven.vanrossem@intec.ugent.be> Thu Feb 09 13:54:42 2017 +0100
tree 3ced8016d6a5e7e177a08e1735c2974da5255347
parent a50ddb3309a321af8af4a8c1b7aec0b9b224989c

imporved son-monitor container startup and timeout

src/emuvim/dcemulator/monitoring.py

diff --git a/src/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
index d0e45da..de96e37 100755
--- a/src/emuvim/dcemulator/monitoring.py
+++ b/src/emuvim/dcemulator/monitoring.py
@@ -600,6 +600,17 @@
                                           labels=['com.containernet'],

                                           name='skewmon'

                                           )

+            # Wait a while for containers to be completely started

+            started = False

+            wait_time = 0

+            while not started:

+                list1 = self.dockercli.containers.list(filters={'status': 'running', 'name': 'prometheus'})

+                if len(list1) >= 1:

+                    started = True

+                if wait_time > 5:

+                    return 'skewmon not started'

+                time.sleep(1)

+                wait_time += 1

         return ret