[update] launcher

db/dbClient.py

@@ -53,9 +53,7 @@ def __init__(self, db_conn):
         init
         :return:
         """
-        self.db_conn = db_conn
         self.parseDbConn(db_conn)
-        self.__printConfig()
         self.__initDbClient()
 
     @classmethod
@@ -79,8 +77,6 @@ def __initDbClient(self):
             __type = "ssdbClient"
         elif "REDIS" == self.db_type:
             __type = "redisClient"
-        elif "MONGODB" == self.db_type:
-            __type = "mongodbClient"
         else:
             pass
         assert __type, 'type error, Not support DB type: {}'.format(self.db_type)
@@ -90,15 +86,6 @@ def __initDbClient(self):
                                                                                      password=self.db_pwd,
                                                                                      db=self.db_name)
 
-    def __printConfig(self):
-        print("============ DATABASE CONFIGURE =========================")
-        print("DB_TYPE: %s" % self.db_type)
-        print("DB_HOST: %s" % self.db_host)
-        print("DB_PORT: %s" % self.db_port)
-        print("DB_NAME: %s" % self.db_name)
-        print("DB_USER: %s" % self.db_user)
-        print("=========================================================")
-
     def get(self, **kwargs):
         return self.client.get(**kwargs)
 
@@ -128,3 +115,6 @@ def changeTable(self, name):
 
     def getCount(self):
         return self.client.getCount()
+
+    def test(self):
+        return self.client.test()

db/redisClient.py

@@ -13,7 +13,9 @@
 """
 __author__ = 'JHao'
 
+from redis.exceptions import TimeoutError, ConnectionError, ResponseError
 from redis.connection import BlockingConnectionPool
+from handler.logHandler import LogHandler
 from random import choice
 from redis import Redis
 
@@ -38,7 +40,10 @@ def __init__(self, **kwargs):
         """
         self.name = ""
         kwargs.pop("username")
-        self.__conn = Redis(connection_pool=BlockingConnectionPool(decode_responses=True, **kwargs))
+        self.__conn = Redis(connection_pool=BlockingConnectionPool(decode_responses=True,
+                                                                   timeout=5,
+                                                                   socket_timeout=5,
+                                                                   **kwargs))
 
     def get(self):
         """
@@ -127,3 +132,17 @@ def changeTable(self, name):
         :return:
         """
         self.name = name
+
+    def test(self):
+        log = LogHandler('redis_client')
+        try:
+            self.getCount()
+        except TimeoutError as e:
+            log.error('redis connection time out: %s' % str(e), exc_info=True)
+            return e
+        except ConnectionError as e:
+            log.error('redis connection error: %s' % str(e), exc_info=True)
+            return e
+        except ResponseError as e:
+            log.error('redis connection error: %s' % str(e), exc_info=True)
+            return e

db/ssdbClient.py

@@ -15,8 +15,9 @@
 -------------------------------------------------
 """
 __author__ = 'JHao'
-
+from redis.exceptions import TimeoutError, ConnectionError, ResponseError
 from redis.connection import BlockingConnectionPool
+from handler.logHandler import LogHandler
 from random import choice
 from redis import Redis
 
@@ -39,7 +40,10 @@ def __init__(self, **kwargs):
         """
         self.name = ""
         kwargs.pop("username")
-        self.__conn = Redis(connection_pool=BlockingConnectionPool(decode_responses=True, **kwargs))
+        self.__conn = Redis(connection_pool=BlockingConnectionPool(decode_responses=True,
+                                                                   timeout=5,
+                                                                   socket_timeout=5,
+                                                                   **kwargs))
 
     def get(self):
         """
@@ -128,3 +132,17 @@ def changeTable(self, name):
         :return:
         """
         self.name = name
+
+    def test(self):
+        log = LogHandler('ssdb_client')
+        try:
+            self.getCount()
+        except TimeoutError as e:
+            log.error('ssdb connection time out: %s' % str(e), exc_info=True)
+            return e
+        except ConnectionError as e:
+            log.error('ssdb connection error: %s' % str(e), exc_info=True)
+            return e
+        except ResponseError as e:
+            log.error('ssdb connection error: %s' % str(e), exc_info=True)
+            return e

helper/launcher.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+"""
+-------------------------------------------------
+   File Name：     launcher
+   Description :   启动器
+   Author :        JHao
+   date：          2021/3/26
+-------------------------------------------------
+   Change Activity:
+                   2021/3/26: 启动器
+-------------------------------------------------
+"""
+__author__ = 'JHao'
+
+import sys
+from db.dbClient import DbClient
+from handler.logHandler import LogHandler
+from handler.configHandler import ConfigHandler
+
+log = LogHandler('launcher')
+
+
+def startServer():
+    __beforeStart()
+    from api.proxyApi import runFlask
+    runFlask()
+
+
+def startScheduler():
+    __beforeStart()
+    from helper.scheduler import runScheduler
+    runScheduler()
+
+
+def __beforeStart():
+    __showVersion()
+    __showConfigure()
+    if __checkDBConfig():
+        log.info('exit!')
+        sys.exit()
+
+
+def __showVersion():
+    from setting import VERSION
+    log.info("ProxyPool Version: %s" % VERSION)
+
+
+def __showConfigure():
+    conf = ConfigHandler()
+    log.info("ProxyPool configure HOST: %s" % conf.serverHost)
+    log.info("ProxyPool configure PORT: %s" % conf.serverPort)
+    log.info("ProxyPool configure DB_CONN: %s" % conf.dbConn)
+    log.info("ProxyPool configure PROXY_FETCHER: %s" % conf.fetchers)
+
+
+def __checkDBConfig():
+    conf = ConfigHandler()
+    db = DbClient(conf.dbConn)
+    log.info("============ DATABASE CONFIGURE ================")
+    log.info("DB_TYPE: %s" % db.db_type)
+    log.info("DB_HOST: %s" % db.db_host)
+    log.info("DB_PORT: %s" % db.db_port)
+    log.info("DB_NAME: %s" % db.db_name)
+    log.info("DB_USER: %s" % db.db_user)
+    log.info("=================================================")
+    return db.test()

proxyPool.py

@@ -13,7 +13,7 @@
 __author__ = 'JHao'
 
 import click
-
+from helper.launcher import startServer, startScheduler
 from setting import BANNER, VERSION
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
@@ -29,18 +29,14 @@ def cli():
 def schedule():
     """ 启动调度程序 """
     click.echo(BANNER)
-    click.echo("VERSION: %s\n" % VERSION)
-    from helper.scheduler import runScheduler
-    runScheduler()
+    startScheduler()
 
 
 @cli.command(name="server")
 def server():
     """ 启动api服务 """
     click.echo(BANNER)
-    click.echo("VERSION: %s\n" % VERSION)
-    from api.proxyApi import runFlask
-    runFlask()
+    startServer()
 
 
 if __name__ == '__main__':