1.hub使用单例模式;2.优化其他功能模块对log模块的引用

donghu-jiang · donghu-jiang · commit 56b9305f85a2 · 2021-07-28T17:35:53.000+08:00
Change-Id: I254b407fba7e141a4061be46d32294f06684689e
diff --git a/explorer/explorer.py b/explorer/explorer.py
@@ -31,20 +31,22 @@
 from enum import Enum
 from enum import IntEnum
 from Crypto.Cipher import AES
-from explorer.providers.providers import Providers
+from hub.hub import QcloudHub
 from explorer.services.template.template import Template
 
 class QcloudExplorer(object):
 
-    def __init__(self, device_file, tls=True, userdata=None):
+    def __init__(self, device_file, tls=True, userdata=None, domain=None, useWebsocket=False):
         self.__device_file = device_file
         self.__tls = tls
         """ 用户传参 """
         self.__userdata = userdata
+        self.__domain = domain
+        self.__useWebsocket = useWebsocket
         """ 存放用户注册的回调函数 """
         self.__user_callback = {}
 
-        self.__provider = Providers(device_file, self.__userdata, tls)
+        self.__provider = QcloudHub(device_file, userdata, tls, domain, useWebsocket)
         self.__hub = self.__provider.hub
         """
         向hub注册mqtt disconnect回调
@@ -607,7 +609,8 @@ def templateInit(self, productId, deviceName,
         构造对应client的template对象并加入字典
         """
         client = productId + deviceName
-        template = Template(self.__device_file, self.__tls, productId, deviceName, self.__logger)
+        template = Template(self.__device_file, self.__tls, productId, deviceName,
+                                self.__userdata, self.__domain, self.__useWebsocket, self.__logger)
 
         """
         注册用户数据模板topic(property/action/event)对应回调
diff --git a/explorer/providers/__init__.py b/explorer/providers/__init__.py
diff --git a/explorer/providers/providers.py b/explorer/providers/providers.py
diff --git a/explorer/services/template/template.py b/explorer/services/template/template.py
@@ -12,13 +12,16 @@
 # limitations under the License.
 
 import json
-from explorer.providers.providers import Providers
+# from explorer.providers.providers import Providers
+from hub.hub import QcloudHub
 from hub.utils.providers import TopicProvider
 
 class Template(object):
-    def __init__(self, device_file, tls, productId, deviceName, logger=None):
+    def __init__(self, device_file, tls, productId, deviceName, userdata=None, domain=None, useWebsocket=False, logger=None):
         self.__logger = logger
-        self.__provider = Providers(device_file, tls)
+        # self.__provider = Providers(device_file, tls)
+        # self.__hub = self.__provider.hub
+        self.__provider = QcloudHub(device_file, userdata, tls, domain, useWebsocket)
         self.__hub = self.__provider.hub
 
         self.__topic = TopicProvider(productId, deviceName)
diff --git a/hub/hub.py b/hub/hub.py
@@ -24,7 +24,6 @@
 import urllib.error
 from enum import Enum
 from enum import IntEnum
-from hub.log.log import Log
 from hub.utils.codec import Codec
 from hub.utils.providers import TopicProvider
 from hub.utils.providers import DeviceInfoProvider
@@ -37,7 +36,26 @@
 from hub.services.shadow.shadow import Shadow
 from hub.services.ota.ota import Ota
 
-class QcloudHub(object):
+class SingletonType(type):
+    _instance_lock = threading.Lock()
+    def __call__(cls, *args, **kwargs):
+        if not hasattr(cls, "_instance"):
+            with SingletonType._instance_lock:
+                if not hasattr(cls, "_instance"):
+                    cls._instance = super(SingletonType,cls).__call__(*args, **kwargs)
+        return cls._instance
+
+class QcloudHub(metaclass=SingletonType):
+    """
+    使用单例模式构建,保证对象只有一份
+    """
+    def __init__(self, device_file, userdata=None, tls=True, domain=None, useWebsocket=False):
+        self.hub = QcloudHubProvider(device_file, userdata=userdata, tls=tls, domain=domain, useWebsocket=useWebsocket)
+
+    def __new__(cls, *args, **kwargs):
+        return object.__new__(cls)
+
+class QcloudHubProvider(object):
     """事件核心处理层
     作为explorer/user层与协议层的中间层,负责上下层通道建立、消息分发等事物
     """
@@ -54,9 +72,9 @@ def __init__(self, device_file, userdata=None, tls=True, domain=None, useWebsock
         self.__log_provider = LoggerProvider()
         self._logger = self.__log_provider.logger
         self.__codec = Codec()
-        # 确保__protocol初始化后再初始化__gateway,以便传参
         self.__gateway = None
-        self.__device_info = DeviceInfoProvider(device_file, self._logger)
+        self.__device_info = DeviceInfoProvider(device_file)
+
         self.__hub_state = self.HubState.INITIALIZED
         self._topic = TopicProvider(self.__device_info.product_id, self.__device_info.device_name)
 
@@ -155,7 +173,7 @@ class LoopWorker(object):
         """ mqtt连接管理维护 """
         def __init__(self, logger=None):
             self._connect_async_req = False
-            self._exit_req = False
+            self._exit_req = True
             self._runing_state = False
             self._exit_req_lock = threading.Lock()
             self._thread = TaskManager.LoopThread(logger)
@@ -1009,7 +1027,7 @@ def gatewayInit(self):
 
         self.__gateway = Gateway(self.__host, self.__device_info.product_id, self.__device_info.device_name,
                                     self.__device_info.device_secret, websocket=self.__useWebsocket,
-                                    tls=self.__tls, logger=self._logger)
+                                    tls=self.__tls)
         json_data = self.__device_info.json_data
         gateway_topic_sub = self._topic.gateway_topic_sub
 
diff --git a/hub/services/gateway/gateway.py b/hub/services/gateway/gateway.py
@@ -18,14 +18,17 @@
 import random
 from enum import Enum
 from hub.utils.codec import Codec
+from hub.utils.providers import LoggerProvider
 from hub.utils.providers import ConnClientProvider
 
 class Gateway(object):
     def __init__(self, host, product_id, device_name, device_secret,
-                    websocket=False, tls=True, logger=None):
-        self.__logger = logger
+                    websocket=False, tls=True):
+        # self.__logger = logger
+        self.__log_provider = LoggerProvider()
+        self.__logger = self.__log_provider.logger
         self.__provider = ConnClientProvider(host, product_id, device_name, device_secret,
-                                                websocket=websocket, tls=tls, logger=logger)
+                                                websocket=websocket, tls=tls)
         self.__protocol = self.__provider.protocol
         self.__codec = Codec()
 
@@ -348,7 +351,7 @@ def gateway_get_subdev_bind_list(self, topic, qos, product_id, device_name):
         else:
             self.__logger.debug("client:%s %s fail" % (client_id, "get bind list"))
 
-        return self.__gateway_subdev_bind_list
+        return rc, self.__gateway_subdev_bind_list
 
     def gateway_get_subdev_config_list(self):
         """
diff --git a/hub/utils/providers.py b/hub/utils/providers.py
@@ -168,9 +168,11 @@ def control_clientToken(self, token):
         self.__clientToken = token
 
 class DeviceInfoProvider(object):
-    def __init__(self, file_path, logger=None):
+    def __init__(self, file_path):
         self.__file_path = file_path
-        self.__logger = logger
+        # self.__logger = logger
+        self.__log_provider = LoggerProvider()
+        self.__logger = self.__log_provider.logger
         self.__logger.info('device_info file {}'.format(file_path))
 
         self.__auth_mode = None
