Debug messages

doc/composer_files/MOG.yaml

@@ -12,7 +12,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/inputdistributor
+    image: 129.7.98.3:5000/mogswitch/inputdistributor
 
   input2:
     container_name: InputDistributor2
@@ -25,7 +25,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/inputdistributor
+    image: 129.7.98.3:5000/mogswitch/inputdistributor
 
   proxy:
     container_name: ProxyTranscoder
@@ -36,7 +36,7 @@ services:
       - multicastAddrPort=3000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   proxy2:
@@ -48,7 +48,7 @@ services:
       - multicastAddrPort=3002
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   proxyOut:
@@ -60,7 +60,7 @@ services:
       - multicastAddrPort=6000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   switcher:
@@ -81,7 +81,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/videoswitcher
+    image: 129.7.98.3:5000/mogswitch/videoswitcher
 
   output:
     container_name: OutputTranscoder
@@ -94,5 +94,5 @@ services:
       - videoHeight=100
       - OutIP=192.168.1.194
       - OutPort=4000
-    image: 145.100.133.241:5000/mogswitch/outputtranscoder
+    image: 129.7.98.3:5000/mogswitch/outputtranscoder
     privileged: true

doc/input_tosca_files/docker-composerMOG.yaml

@@ -12,7 +12,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/inputdistributor
+    image: 129.7.98.3:5000/mogswitch/inputdistributor
 
   input2:
     container_name: InputDistributor2
@@ -25,7 +25,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/inputdistributor
+    image: 129.7.98.3:5000/mogswitch/inputdistributor
 
   proxy:
     container_name: ProxyTranscoder
@@ -36,7 +36,7 @@ services:
       - multicastAddrPort=3000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   proxy2:
@@ -48,7 +48,7 @@ services:
       - multicastAddrPort=3002
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   proxyOut:
@@ -60,7 +60,7 @@ services:
       - multicastAddrPort=6000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    image: 129.7.98.3:5000/mogswitch/proxytranscoder
     privileged: true
 
   switcher:
@@ -81,7 +81,7 @@ services:
       - waitingTime=1000
       - videoWidth=176
       - videoHeight=100
-    image: 145.100.133.241:5000/mogswitch/videoswitcher
+    image: 129.7.98.3:5000/mogswitch/videoswitcher
 
   output:
     container_name: OutputTranscoder
@@ -94,5 +94,5 @@ services:
       - videoHeight=100
       - OutIP=192.168.1.194
       - OutPort=4000
-    image: 145.100.133.241:5000/mogswitch/outputtranscoder
+    image: 129.7.98.3:5000/mogswitch/outputtranscoder
     privileged: true

drip-deployer/rpc_server.py

@@ -9,6 +9,9 @@ import docker_kubernetes
 import docker_engine
 import docker_swarm
 import control_agent
+import sys, argparse
+from threading import Thread
+from time import sleep
 
 print sys.argv
 if len(sys.argv) > 1:
@@ -23,6 +26,13 @@ channel.queue_declare(queue='deployer_queue')
 
 path = os.path.dirname(os.path.abspath(__file__)) + "/"
 
+
+def threaded_function(args):
+    while True:
+        #print "processing data events"
+        connection.process_data_events()
+        sleep(30)
+
 def handleDelivery(message):
     parsed_json = json.loads(message)
     params = parsed_json["parameters"]  
@@ -82,6 +92,8 @@ def on_request(ch, method, props, body):
     par["attributes"] = "null"
     response["parameters"].append(par)
 
+    print "Response: %s " % response
+    
     ch.basic_publish(exchange='',
                      routing_key=props.reply_to,
                      properties=pika.BasicProperties(correlation_id = \
@@ -92,5 +104,10 @@ def on_request(ch, method, props, body):
 channel.basic_qos(prefetch_count=1)
 channel.basic_consume(on_request, queue='deployer_queue')
 
+
+thread = Thread(target = threaded_function, args = (1, ))
+thread.start()
+
 print(" [x] Awaiting RPC requests")
 channel.start_consuming()
+thread.stop()
\ No newline at end of file