Merge remote-tracking branch 'upstream/master' into production

bin/SentimentAnalysis.py

@@ -124,6 +124,16 @@ def isJSON(content):
     except Exception,e:
         return False
 
+import signal
+
+class TimeoutException(Exception):
+    pass
+
+def timeout_handler(signum, frame):
+    raise TimeoutException
+
+signal.signal(signal.SIGALRM, timeout_handler)
+
 if __name__ == '__main__':
     # If you wish to use an other port of channel, do not forget to run a subscriber accordingly (see launch_logs.sh)
     # Port of the redis instance used by pubsublogger
@@ -152,6 +162,12 @@ if __name__ == '__main__':
             publisher.debug("{} queue is empty, waiting".format(config_section))
             time.sleep(1)
             continue
-
+        signal.alarm(60)
+        try:
             Analyse(message, server)
+        except TimeoutException:
+            print ("{0} processing timeout".format(message))
+            continue
+        else:
+            signal.alarm(0)