From 0dc337197311d0fec373bf479f8ee0ac26b4cad6 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期三, 15 六月 2022 16:33:47 +0800
Subject: [PATCH] client enhanced&camera contorller

---
 src/Server.py |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Server.py b/src/Server.py
index 3b50887..af20966 100644
--- a/src/Server.py
+++ b/src/Server.py
@@ -34,7 +34,7 @@
         self.WEBhost = WEBhost
         self.WEBport = WEBport
         self.save_folder = save_folder
-        self.server_name = "server0"
+        self.server_name = server_name
         
 
         # self.route('/api', methods=['POST'])(self.api)
@@ -53,9 +53,14 @@
         self.parameters = pika.ConnectionParameters(
             credentials=credentials, host=self.MQhost)
         # 杩炴帴闃熷垪鏈嶅姟鍣�
-        connection = pika.BlockingConnection(self.parameters)
-        print(f"connected to MQ server: {self.MQhost} with user {self.MQuser}")
-        connection.close()
+        try:
+            self.connection = pika.BlockingConnection(self.parameters)
+            print(f"connected to MQ server: {self.MQhost} with user {self.MQuser}")
+            self.connection.close()
+        except Exception :
+            print("Can't connecting to the MQ server")
+            exit(1)
+
 
 
     def _receiver_Thread_Launcher(self):
@@ -66,7 +71,7 @@
                                     exchange_name='logs_topic',
                                     exchange_type='topic',
                                     MQqueue_name=f'logs_queue',
-                                    binding_keys='server.logs.test0',
+                                    binding_keys=['server.logs.test0'],
                                     message_queue=self.LogsReceiver_queue
                                     )
         self.LogsReceiver_Thread.setDaemon(True)
@@ -79,7 +84,7 @@
                                     exchange_name='images_topic',
                                     exchange_type='topic',
                                     MQqueue_name=f'images_queue',
-                                    binding_keys="server.images.test0",
+                                    binding_keys=["server.images.test0"],
                                     message_queue=self.ImagesReceiver_queue
                                     )
         self.ImagesReceiver_Thread.setDaemon(True)
@@ -92,7 +97,7 @@
                                     exchange_name='plys_topic',
                                     exchange_type='topic',
                                     MQqueue_name=f'plys_queue',
-                                    binding_keys='server.plys.test0',
+                                    binding_keys=['server.plys.test0'],
                                     message_queue=self.PlysReceiver_queue
                                     )
         self.PlysReceiver_Thread.setDaemon(True)
@@ -115,7 +120,7 @@
     
     def _sender_Thread_Launcher(self):
 
-        # launcher command sender thread
+        # launcher commands sender thread
         self.CommandsSender_Thread = ths.senderThread(
                                     MQparams=self.parameters,
                                     exchange_name='commands_topic',

--
Gitblit v1.9.1