Merge pull request #926 from midoks/dev

常规更新

Author: midoks

plugins/webstats/index.py

@@ -899,7 +899,7 @@ def getLogsErrorList():
     limit = str(page_size) + ' offset ' + str(page_size * (page - 1))
     conn = pSqliteDb('web_logs', domain)
 
-    field = 'time,ip,domain,server_name,method,protocol,status_code,ip_list,client_port,body_length,user_agent,referer,request_time,uri,body_length'
+    field = 'time,scheme,ip,domain,server_name,method,protocol,status_code,ip_list,client_port,body_length,user_agent,referer,request_time,uri,body_length'
     conn = conn.field(field)
     conn = conn.where("1=1", ())
 

plugins/webstats/tool_migrate.py

@@ -116,8 +116,9 @@ def migrateSiteHotLogs(site_name, query_date):
         time.sleep(0.5)
         copy_start = time.time()
         # import shutil
-        # shutil.copy(hot_db, hot_db_tmp)
-        mw.fastCopy(hot_db, hot_db_tmp, 256 * 1024)
+        shutil.copy(hot_db, hot_db_tmp)
+        # mw.fastCopy(hot_db, hot_db_tmp, 256 * 1024)
+        # mw.sendfile(hot_db,hot_db_tmp)
         print(f"[{site_name}] 备份完成，耗时 {time.time() - copy_start:.2f}s")
         if not os.path.exists(hot_db_tmp):
             return mw.returnMsg(False, f"{site_name} migrating fail, copy tmp file!")

plugins/webstats/webstats_index.py

@@ -858,7 +858,7 @@ def getLogsErrorList():
     limit = str(page_size) + ' offset ' + str(page_size * (page - 1))
     conn = pSqliteDb('web_logs', domain)
 
-    field = 'time,ip,domain,server_name,method,protocol,status_code,ip_list,client_port,body_length,user_agent,referer,request_time,uri'
+    field = 'time,scheme,ip,domain,server_name,method,protocol,status_code,ip_list,client_port,body_length,user_agent,referer,request_time,uri'
     conn = conn.field(field)
     conn = conn.where("1=1", ())
 

web/core/mw.py

@@ -324,6 +324,30 @@ def fastCopy(src, dst, buffer_size=256 * 1024):  # 128MB 缓冲区
         with open(dst, 'wb') as fdst:
             shutil.copyfileobj(fsrc, fdst, length=buffer_size)
 
+
+# linux高效复制
+def sendfile(src, dst):
+    if isAppleSystem():
+        try:
+            shutil.copyfile(src, dst)
+            return True
+        except Exception as e:
+            return False
+    
+    try:
+        with open(src, 'rb') as fsrc, open(dst, 'wb') as fdst:
+            filesize = os.fstat(fsrc.fileno()).st_size
+            sent = os.sendfile(fdst.fileno(), fsrc.fileno(), 0, filesize)
+            if sent != filesize:
+                shutil.copyfile(src, dst)
+        return True
+    except (OSError, AttributeError) as e:
+        try:
+            shutil.copyfile(src, dst)
+            return True
+        except Exception as e2:
+            return False
+
 def returnData(status, msg, data=None):
     if data is None:
         return {'status': status, 'msg': msg}