diff --git a/class/plugin/orm.py b/class/plugin/orm.py index 65d3a2135..34a5605e4 100755 --- a/class/plugin/orm.py +++ b/class/plugin/orm.py @@ -22,6 +22,7 @@ class ORM: __DB_CHARSET = "utf8" def __Conn(self): + # print(self.__DB_HOST, self.__DB_USER) '''连接数据库''' try: @@ -37,7 +38,7 @@ class ORM: database=self.__DB_NAME, port=int(self.__DB_PORT), charset=self.__DB_CHARSET, connect_timeout=1, cursorclass=pymysql.cursors.DictCursor) - else if os.path.exists(self.__DB_SOCKET): + elif os.path.exists(self.__DB_SOCKET): try: self.__DB_CONN = pymysql.connect(host=self.__DB_HOST, user=self.__DB_USER, passwd=self.__DB_PASS, database=self.__DB_NAME, diff --git a/plugins/mysql/index.py b/plugins/mysql/index.py index 48aba1a78..d6710cc5a 100755 --- a/plugins/mysql/index.py +++ b/plugins/mysql/index.py @@ -3054,6 +3054,7 @@ def syncDatabaseRepair(version=''): tables = local_db.query('show tables from `%s`' % sync_args_db) table_key = "Tables_in_" + sync_args_db + inconsistent_table = [] for tb in tables: table_name = sync_args_db+'.'+tb[table_key] @@ -3062,9 +3063,11 @@ def syncDatabaseRepair(version=''): local_count_data = local_db.query(cmd_count_sql) sync_count_data = sync_db.query(cmd_count_sql) - print(local_count_data,sync_count_data) - - + if local_count_data[0]['num'] != local_count_data[0]['num']: + inconsistent_table.append(table_name) + else: + print(table_name+', 正常OK') + print(inconsistent_table) data = sync_db.query("select version()") print(data)