Merge pull request #100 in CATS/pyclowder from bugfix/CATSPYC-30-heartbeat-of-extractors-crashes to release/2.2.3

* commit '85d9a090f04c24e8f13bf6dd6dea46c048b3a5a8':
  fix bug with heartbeat
  monitor moved to clowder

Author: robkooper

contrib/monitor/Dockerfile

@@ -25,6 +25,3 @@ ${DEBUG} docker build --build-arg PYCLOWDER_PYTHON="-python3" --tag clowder/extr
 ${DEBUG} docker build --build-arg PYCLOWDER_PYTHON="-python3" --tag clowder/extractors-wordcount:latest sample-extractors/wordcount
 ${DEBUG} docker build --build-arg PYCLOWDER_PYTHON="-python3" --tag clowder/extractors-wordcount-simple-extractor:latest sample-extractors/wordcount-simple-extractor
 ${DEBUG} docker build --build-arg PYCLOWDER_PYTHON="-python3" --tag clowder/extractors-wordcount-simple-r-extractor:latest sample-extractors/wordcount-simple-r-extractor
-
-# build contrib
-${DEBUG} docker build --tag clowder/extractors-monitor:latest contrib/monitor

contrib/monitor/monitor.py

@@ -37,6 +37,7 @@
 import os
 import pickle
 import subprocess
+import sys
 import time
 import tempfile
 import threading
@@ -808,10 +809,13 @@ def send_heartbeat(self):
             'queue': self.rabbitmq_queue,
             'extractor_info': self.extractor_info
         }
+        next_heartbeat = time.time()
         while self.thread:
             try:
-                self.channel.basic_publish(exchange='extractors', routing_key='', body=json.dumps(message))
-                time.sleep(self.heartbeat)
+                self.channel.connection.process_data_events()
+                if time.time() >= next_heartbeat:
+                    self.channel.basic_publish(exchange='extractors', routing_key='', body=json.dumps(message))
+                    next_heartbeat = time.time() + self.heartbeat
             except SystemExit:
                 raise
             except KeyboardInterrupt:
@@ -820,6 +824,8 @@ def send_heartbeat(self):
                 raise
             except Exception:  # pylint: disable=broad-except
                 logging.getLogger(__name__).exception("Error while sending heartbeat.")
+                sys.exit(-1)
+            time.sleep(1)
 
 
 class RabbitMQHandler(Connector):

docker.sh

@@ -37,7 +37,7 @@ else
 fi
 
 # tag all images and push if needed
-for i in pyclowder pyclowder-python3 extractors-monitor extractors-wordcount; do
+for i in pyclowder pyclowder-python3 extractors-wordcount; do
     for v in ${TAGS}; do
         if [ "$v" != "latest" -o "$SERVER" != "" ]; then
             ${DEBUG} docker tag clowder/${i}:latest ${SERVER}clowder/${i}:${v}
@@ -49,15 +49,16 @@ done
 # tag all images for onbuild and push if needed
 for i in pyclowder extractors-binary-preview extractors-simple-extractor extractors-simple-r-extractor; do
     for j in "" "-python3"; do
-        for v in ${VERSION}; do
+        for v in ${TAGS}; do
             if [ "$v" != "latest" ]; then
-                ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:${v}-onbuild
-                ${DEBUG} docker push ${SERVER}clowder/${i}:${v}-onbuild
+                ${DEBUG} docker tag clowder/${i}${j}:onbuild ${SERVER}clowder/${i}${j}:${v}-onbuild
+                ${DEBUG} docker push ${SERVER}clowder/${i}${j}:${v}-onbuild
             elif [ "$SERVER" != "" ]; then
-                ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:onbuild
-                ${DEBUG} docker push ${SERVER}clowder/${i}:onbuild
+                ${DEBUG} docker tag clowder/${i}{j}:onbuild ${SERVER}clowder/${i}${j}:onbuild
+                ${DEBUG} docker push ${SERVER}clowder/${i}${j}:onbuild
             else
-                ${DEBUG} docker push clowder/${i}:onbuild
+                ${DEBUG} docker tag clowder/${i}${j}:onbuild clowder/${i}${j}:onbuild
+                ${DEBUG} docker push clowder/${i}${j}:onbuild
             fi
         done
     done