update

web/core/db.py

@@ -67,6 +67,19 @@ class Sql():
                 print(getTracebackInfo())
                 raise
 
+    def close(self):
+        # 关闭数据库连接
+        if self.__DB_CONN is not None:
+            try:
+                self.__DB_CONN.close()
+                self.__DB_CONN = None
+            except Exception as ex:
+                pass
+
+    def __del__(self):
+        # 对象销毁时自动关闭连接
+        self.close()
+
     def changeTextFactoryToBytes(self):
         self.__DB_CONN.text_factory = bytes
         return True

web/utils/system/monitor.py

@@ -73,7 +73,9 @@ class monitor:
         return True
 
     def getMonitorDay(self):
-        monitor_day = mw.M('option').field('name').where('name=?',('monitor_day',)).getField('value')
+        db = mw.M('option')
+        monitor_day = db.field('name').where('name=?',('monitor_day',)).getField('value')
+        db.close()
         if monitor_day is None or monitor_day == '':
             return 30
         try:
@@ -82,7 +84,9 @@ class monitor:
             return 30
 
     def isOnlyNetIoStats(self):
-        monitor_only_netio = mw.M('option').field('name').where('name=?',('monitor_only_netio',)).getField('value')
+        db = mw.M('option')
+        monitor_only_netio = db.field('name').where('name=?',('monitor_only_netio',)).getField('value')
+        db.close()
         if monitor_only_netio == 'open':
             return True
         return False
@@ -170,18 +174,21 @@ class monitor:
         cmd_objm = mw.M('cpuio').dbPos(mw.getPanelDataDir(),'system')
         cmd_objm.add('pro,mem,addtime', cpu_mem_data)
         cmd_objm.where("addtime<?", (deltime,)).delete()
+        cmd_objm.close()
 
         # 网络数据入库
         netio_data = (netio['up'] / 5, netio['down'] / 5, netio['upTotal'], netio['downTotal'], netio['downPackets'], netio['upPackets'], addtime)
         network_objm = mw.M('network').dbPos(mw.getPanelDataDir(),'system')
         network_objm.add('up,down,total_up,total_down,down_packets,up_packets,addtime', netio_data)
         network_objm.where("addtime<?", (deltime,)).delete()
+        network_objm.close()
 
         # 磁盘数据入库
         disk_data = (diskio['read_count'], diskio['write_count'], diskio['read_bytes'], diskio['write_bytes'], diskio['read_time'], diskio['write_time'], addtime)
         disk_objm = mw.M('diskio').dbPos(mw.getPanelDataDir(),'system')
         disk_objm.add('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime', disk_data)
         disk_objm.where("addtime<?", (deltime,)).delete()
+        disk_objm.close()
 
         # 负载数据入库
         load_data = self.getLoadAverage()
@@ -191,6 +198,7 @@ class monitor:
         load_objm = mw.M('load_average').dbPos(mw.getPanelDataDir(),'system')
         load_objm.add('pro,one,five,fifteen,addtime', (lpro, load_data['one'], load_data['five'], load_data['fifteen'], addtime))
         load_objm.where("addtime<?", (deltime,)).delete()
+        load_objm.close()
         return True