debug client for keyboard interruption

Author: asteencern

daq-zmq-client.py

@@ -123,11 +123,11 @@ def get_comma_separated_args(option, opt, value, parser):
     #         outputFile.write(byteArray)
 
     cmd="PROCESS_AND_PUSH_N_EVENTS"
-    puller=context.socket(zmq.PULL)
-    puller.connect("tcp://"+glb_options['serverIpAdress']+":5556")
     socket.send(cmd)
     mes=socket.recv()
     print(mes)
+    puller=context.socket(zmq.PULL)
+    puller.connect("tcp://"+glb_options['serverIpAdress']+":5556")
     try:
         while True:
             for i in xrange(0,daq_options['nEvent']):
@@ -138,17 +138,15 @@ def get_comma_separated_args(option, opt, value, parser):
                 if options.dataNotSaved==False:
                     outputFile.write(byteArray)
             puller.close()
-            
+            socket.send("END_OF_RUN")
+            if socket.recv()=="CLOSING_SERVER":
+                socket.close()
+                context.term()
+            break
+        
     except KeyboardInterrupt:
-        puller.close()
-        socket.send("END_OF_RUN")
-        if socket.recv()=="CLOSING_SERVER":
-            socket.close()
-            context.term()
+        print("keyboard interruption")
+        os.system("ssh -T pi@"+glb_options['serverIpAdress']+" \" killall python\"")
 
-    socket.send("END_OF_RUN")
-    if socket.recv()=="CLOSING_SERVER":
-        socket.close()
-        context.term()
 
 

daq-zmq-server.py

@@ -63,7 +63,6 @@
                 socket.send("start to process and push the events")
                 print("start to process and push the events")
                 for i in xrange(daq_options['nEvent']):
-                    #print("Sending event %d",i)
                     rawdata=theDaq.processEvent()
                     pdata=packer.pack(*rawdata)
                     pusher.send(pdata)
@@ -78,5 +77,6 @@
 
     except KeyboardInterrupt:
         print('\nClosing server')
+        pusher.close()
         socket.close()
         context.term()