mdbq 3.7.10__py3-none-any.whl → 3.7.12__py3-none-any.whl

mdbq/config/default.py

@@ -2,8 +2,8 @@
 import os
 import sys
 import json
-import platform
-import getpass
+# import platform
+# import getpass
 import socket
 import logging
 from mdbq.mysql import mysql

mdbq/mysql/mysql.py

@@ -4,7 +4,6 @@ import platform
 import getpass
 import re
 import time
-from fileinput import filename
 from functools import wraps
 import warnings
 import pymysql
@@ -130,7 +129,7 @@ class MysqlUpload:
                 connection = pymysql.connect(**_config)  # 连接数据库
                 return connection
             except Exception as e:
-                logger.error(f'连接失败，正在重试: {attempts}/{max_try} {e}')
+                logger.error(f'{_db_name}: 连接失败，正在重试: {self.host}:{self.port}  {attempts}/{max_try} {e}')
                 attempts += 1
                 time.sleep(30)
         logger.error(f'{_db_name}: 连接失败，重试次数超限，当前设定次数: {max_try}')
@@ -968,9 +967,9 @@ class MysqlUpload:
             database_exists = cursor.fetchone()
             if not database_exists:
                 # 如果数据库不存在，则新建
-                if '8.138.27' in str(self.host) or platform.system() == "Linux":  # 阿里云 mysql 低版本不支持 0900
-                    sql = f"CREATE DATABASE `{db_name}` COLLATE utf8mb4_unicode_ci"
-                    self.config.update({'charset': 'utf8mb4_unicode_ci'})
+                # if '8.138.27' in str(self.host) or platform.system() == "Linux":  # 阿里云 mysql 低版本不支持 0900
+                #     sql = f"CREATE DATABASE `{db_name}` COLLATE utf8mb4_unicode_ci"
+                #     self.config.update({'charset': 'utf8mb4_unicode_ci'})
                 if '192.168.1.100' in str(self.host):
                     sql = f"CREATE DATABASE `{db_name}`"
                 else:

{mdbq-3.7.10.dist-info → mdbq-3.7.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 3.7.10
+Version: 3.7.12
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-3.7.10.dist-info → mdbq-3.7.12.dist-info}/RECORD

@@ -7,7 +7,7 @@ mdbq/aggregation/query_data.py,sha256=jGKnHm9vRlKCZeIdP15lgpASKaQgoQjPZyd2IsTJY6
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=hJs815hGFwm_X5bP2i9XugG2w2ZY_F0n3-Q0hVpIPPw,4892
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/config/default.py,sha256=tbfjR5lMkvNmwdivtnBxnKVqH5PwFpPM9jaZ9JIOkv4,5088
+mdbq/config/default.py,sha256=LEDVIBR6aEG5iTKgNzNHOPEujVxp6MF-1i7TwqMM2BI,5092
 mdbq/config/myconfig.py,sha256=Akt-7KqSUBdoHQa4_Mw6YC4pA75219d-21iDO30iaD8,894
 mdbq/config/products.py,sha256=FbBIqmyaiq9h03FIeE9W2bwbLm2_5pr6xyzPV-u7Ges,5689
 mdbq/config/set_support.py,sha256=eM2scqDzGNR2kkbYmguRB2ucrqeX0KMh5OMIaGsLem4,877
@@ -18,7 +18,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/log/spider_logging.py,sha256=cTI9BHePz9Q4QThc_OBxTLqX5tF9iPwIQ-dASpf6zCA,2142
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=SY_1UxoB_fQoPTsQeBbThHDsHFAK5Jr7csbzE8z3GPg,97303
+mdbq/mysql/mysql.py,sha256=Iz0_qzzx-5Y-1LVVfEqC31AdT5iWzoRc8xKepSlrIzM,97315
 mdbq/mysql/s_query.py,sha256=pj5ioJfUT81Su9S-km9G49gF5F2MmXXfw_oAIUzhN28,8794
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -34,7 +34,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=8ONSVHEeEY6C68OxAMAR4jB-CtA3mZyd-v6vs94zlnU,25732
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=HK6x0MnpUN1jUSWnLQ_UEH2QSYcLFBGhhUBD3FVwrzY,21840
-mdbq-3.7.10.dist-info/METADATA,sha256=hP3J0cL11HuzjbHeMJ_UklVo6CdFmgpak3pw9XTWwPY,244
-mdbq-3.7.10.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-3.7.10.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.7.10.dist-info/RECORD,,
+mdbq-3.7.12.dist-info/METADATA,sha256=xlfLgLZZ3UHhJWBay8qHeWaLnzbvRmkFj9JwTfIiPpY,244
+mdbq-3.7.12.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mdbq-3.7.12.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.7.12.dist-info/RECORD,,