Merge pull request #1251 from ISISScientificComputing/minor_fixes

Author: Dimitar Tasev

model/message/message.py

@@ -83,7 +83,7 @@ def populate(self, source, overwrite=True):
                     # Set the value of the variable on this object accessing it by name
                     setattr(self, key, value)
             else:
-                raise ValueError("Unexpected key encountered during Message population: '{key}'.")
+                raise ValueError(f"Unexpected key encountered during Message population: '{key}'.")
 
     def validate(self, destination):
         """

monitors/run_detection.py

@@ -132,6 +132,7 @@ def submit_run(self, summary_rb_number, run_number, file_name):
                               rb_number=rb_number,
                               run_number=run_number,
                               data=file_path,
+                              facility="ISIS",
                               started_by=0)  # Autoreduction service code
             self.client.send('/queue/DataReady', message, priority='9')
         else:

utils/clients/queue_client.py

@@ -9,6 +9,7 @@
 """
 import logging
 import uuid
+import socket
 
 import stomp
 from stomp.exception import ConnectFailedException
@@ -93,7 +94,7 @@ def subscribe_queues(self, queue_list, consumer_name, listener):
         for queue in queue_list:
             # prefetchSize limits the processing to 1 message at a time
             self._connection.subscribe(destination=queue,
-                                       id=str(uuid.uuid4()),
+                                       id=socket.gethostname(),
                                        ack="client-individual",
                                        header={'activemq.prefetchSize': '1'})
             self._logger.info("[%s] Subscribing to %s", consumer_name, queue)