From 41240fd8a7c484ec0da8b912881f19e4552f277a Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Wed, 24 May 2017 18:12:12 +0000 Subject: [PATCH] 1. fix: mysql query not commit; 2. fix: if replay folder not created, the log page can not show. --- server/www/teleport/app/eom_app/app/db.py | 2 ++ server/www/teleport/app/eom_app/controller/record.py | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/www/teleport/app/eom_app/app/db.py b/server/www/teleport/app/eom_app/app/db.py index c709dad..e0b8f50 100644 --- a/server/www/teleport/app/eom_app/app/db.py +++ b/server/www/teleport/app/eom_app/app/db.py @@ -433,6 +433,7 @@ class TPMysqlPool(TPDatabasePool): try: cursor.execute(sql) db_ret = cursor.fetchall() + conn.commit() return db_ret except Exception as e: log.e('[mysql] _do_query() failed: {}\n'.format(e.__str__())) @@ -457,6 +458,7 @@ class TPMysqlPool(TPDatabasePool): try: cursor.execute('SELECT LAST_INSERT_ID();') db_ret = cursor.fetchall() + conn.commit() return db_ret[0][0] except Exception as e: log.e('[sqlite] _last_insert_id() failed: {}\n'.format(e.__str__())) diff --git a/server/www/teleport/app/eom_app/controller/record.py b/server/www/teleport/app/eom_app/controller/record.py index b23358f..df01e33 100644 --- a/server/www/teleport/app/eom_app/controller/record.py +++ b/server/www/teleport/app/eom_app/controller/record.py @@ -22,9 +22,13 @@ def get_free_space_bytes(folder): total_bytes = _total_bytes.value free_bytes = _free_bytes.value else: - st = os.statvfs(folder) - total_bytes = st.f_blocks * st.f_frsize - free_bytes = st.f_bavail * st.f_frsize + try: + st = os.statvfs(folder) + total_bytes = st.f_blocks * st.f_frsize + free_bytes = st.f_bavail * st.f_frsize + except: + total_bytes = 0 + free_bytes = 0 return total_bytes, free_bytes