From 685f31f5662bfd9f4ae313f295578a5b3218c895 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Wed, 2 May 2018 17:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E6=96=B0=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E7=9A=84TP=EF=BC=8C=E6=80=BB=E8=A7=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=94=A8=E6=88=B7=E6=95=B0=E4=B8=BA0=E3=80=82?=
 =?UTF-8?q?=E8=87=B3=E5=B0=91=E4=B8=BA1=EF=BC=8C=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=9B=E5=BB=BA=E4=BA=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E8=B4=A6=E5=8F=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/www/teleport/webroot/app/base/db.py      | 7 +++++++
 server/www/teleport/webroot/app/base/stats.py   | 2 +-
 server/www/teleport/webroot/app/model/record.py | 4 ++++
 server/www/teleport/webroot/app/model/stats.py  | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

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