diff --git a/server/www/teleport/webroot/app/base/db.py b/server/www/teleport/webroot/app/base/db.py index 17f1afa..67b7f46 100644 --- a/server/www/teleport/webroot/app/base/db.py +++ b/server/www/teleport/webroot/app/base/db.py @@ -472,9 +472,16 @@ class TPMysqlPool(TPDatabasePool): autocommit=False, connect_timeout=3.0, charset='utf8') + + self._do_exec(conn, 'SET SESSION sql_mode=(SELECT CONCAT(@@sql_mode,",NO_ZERO_DATE,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO"));', args=()) + + # x = self._do_query(conn, 'SELECT @@sql_mode;', args=()) + # print(x) + # err = self._do_exec(conn, 'SET SESSION sql_mode=(SELECT REPLACE(@@sql_mode,"ONLY_FULL_GROUP_BY",""));', args=()) if err is None: log.e('[mysql] can not disable ONLY_FULL_GROUP_BY flag.\n') + return conn except pymysql.err.OperationalError as e: errno, _ = e.args diff --git a/server/www/teleport/webroot/app/base/stats.py b/server/www/teleport/webroot/app/base/stats.py index 4997591..a36eb40 100644 --- a/server/www/teleport/webroot/app/base/stats.py +++ b/server/www/teleport/webroot/app/base/stats.py @@ -28,7 +28,7 @@ class TPStats(object): self._disk_write = 0 self._counter_stats = { - 'user': 0, + 'user': 1, 'host': 0, 'acc': 0, 'conn': 0 diff --git a/server/www/teleport/webroot/app/model/record.py b/server/www/teleport/webroot/app/model/record.py index e00ff8a..3ed2355 100644 --- a/server/www/teleport/webroot/app/model/record.py +++ b/server/www/teleport/webroot/app/model/record.py @@ -476,6 +476,10 @@ def delete_log(log_list): def session_fix(): db = get_db() + + if db.need_create or db.need_upgrade: + return TPE_OK + sql_list = [] sql = 'UPDATE `{dbtp}record` SET state={new_state}, time_end={time_end} WHERE state={old_state};' \ diff --git a/server/www/teleport/webroot/app/model/stats.py b/server/www/teleport/webroot/app/model/stats.py index e98db53..da03baf 100644 --- a/server/www/teleport/webroot/app/model/stats.py +++ b/server/www/teleport/webroot/app/model/stats.py @@ -8,7 +8,7 @@ from app.base.utils import tp_timestamp_utc_now def get_basic_stats(): db = get_db() - ret = {'user': 0, + ret = {'user': 1, 'host': 0, 'acc': 0, 'conn': 0