Merge pull request #562 from DiamondLightSource/547_tidy_fake_zocalo

Make sure fake zocalo, used for developer testing, is tidied up well

fake_zocalo/__main__.py

@@ -128,7 +128,11 @@ def on_request(ch: BlockingChannel, method, props, body):
  channel = conn.channel()
  channel.basic_consume(queue="processing_recipe", on_message_callback=on_request)
  print("Listening for zocalo requests")
- channel.start_consuming()
+ try:
+ channel.start_consuming()
+ except KeyboardInterrupt:
+ print("Shutting down gracefully")
+ channel.close()
 
 
 if __name__ == "__main__":

fake_zocalo/dls_start_fake_zocalo.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
+function cleanup()
+{
+ pkill -f rabbitmq
+ rm -rf /home/$USER/.zocalo/*
+ echo "May take some seconds for zocalo to die, do not immediately try and restart"
+}
+
+trap cleanup EXIT
 
 # kills the gda dummy activemq, that takes the port for rabbitmq
 module load dasctools
@@ -11,4 +19,4 @@ module load rabbitmq/dev
 module load dials/latest
 
 source .venv/bin/activate
-python fake_zocalo/__main__.py
+python fake_zocalo/__main__.py