kcwebs 3.15__tar.gz → 3.16__tar.gz

{kcwebs-3.15 → kcwebs-3.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 3.15
+Version: 3.16
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs3.15
+Keywords: kcwebs3.16
 Platform: UNKNOWN

{kcwebs-3.15 → kcwebs-3.16}/kcwebs/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '3.15'
+__version__ = '3.16'
 
 kcwebsinfo={}
 kcwebsinfo['name']='kcwebs'                             #项目的名称

{kcwebs-3.15 → kcwebs-3.16}/kcwebs/utill/queues.py

@@ -32,7 +32,7 @@ class Queues():
                 model_kcwebs_tasks=model_kcwebs_task()
                 model_kcwebs_tasks.create_table()
             try:
-                kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").find()
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").find()
             except:
                 model_kcwebs_tasks=model_kcwebs_task()
                 model_kcwebs_tasks.create_table()
@@ -45,7 +45,7 @@ class Queues():
                 model_kcwebs_tasks=model_kcwebs_task()
                 model_kcwebs_tasks.create_table()
             try:
-                kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").find()
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").find()
             except:
                 model_kcwebs_tasks=model_kcwebs_task()
                 model_kcwebs_tasks.create_table()
@@ -55,8 +55,8 @@ class Queues():
             t.start()
     def _messagequeueprocess(processglobalqueue):
         """不支持外部调用"""
-        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code=2 and updtime<"+str(int(time.time())-86400*7)).delete()
-        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code=3 and updtime<"+str(int(time.time())-1200)).delete()
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=2 and updtime<"+str(int(time.time())-86400*7)).delete()
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=3 and updtime<"+str(int(time.time())-1200)).delete()
         pid = os.getpid()
         pdfile=os.path.split(os.path.realpath(__file__))[0][:-6]+'/pid/queues_pid_'+str(pid) #pid存放文件
         f=open(pdfile,'w')
@@ -65,62 +65,62 @@ class Queues():
         while True:
             if not processglobalqueue.empty():
                 value=processglobalqueue.get()
-                kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":3,"error":""})
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":3,"error":""})
                 if value['args']:
                     try:
                         value['target'](*value['args'])
                     except:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
                     else:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
                 else:
                     try:
                         value['target']()
                     except:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
                     else:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
             else:
                 time.sleep(0.01)
     def __messagequeue():
-        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code=2 and updtime<"+str(int(time.time())-86400*7)).delete()
-        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code=3 and updtime<"+str(int(time.time())-1200)).delete()
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=2 and updtime<"+str(int(time.time())-86400*7)).delete()
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code=3 and updtime<"+str(int(time.time())-1200)).delete()
         while True:
             if not Queues.__globalqueue.empty():
                 value=Queues.__globalqueue.get()
-                kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":3,"error":""})
+                kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":3,"error":""})
                 if value['args']:
                     try:
                         value['target'](*value['args'])
                     except:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
                     else:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
                 else:
                     try:
                         value['target']()
                     except:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":1,'endtime':int(time.time()),'updtime':int(time.time()),"error":str(traceback.format_exc())})
                     else:
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid = '"+value['task']['taskid']+"' and code!=4").update({"code":4,"start":100,'endtime':int(time.time()),'updtime':int(time.time())})
             else:
                 time.sleep(0.01)
     def delhist():
         """清除任务历史记录(包括 成功的 失败的 已完成的)"""
-        return kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code","in",0,1,4).delete()
+        return kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code","in",0,1,4).delete()
     def delwhere(where):
         "通过where条件删除 (不推荐使用)"
-        return kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where(where).delete()
+        return kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where(where).delete()
     def seltitle(title):
         "通过标题查询 (不推荐使用)"
         try:
-            return kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("title='"+title+"'").select()
+            return kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("title='"+title+"'").select()
         except:
             return ''
     def setfield(taskid,key,value):
         """设置指定字段(不建议使用)"""
         try:
-            return kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid",taskid).update({key:value})
+            return kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).update({key:value})
         except:
             return False
     def setstart(taskid,start=0.001,describes=None):
@@ -129,7 +129,7 @@ class Queues():
         start 支持0.001到10
         """
         if start>=0.001 and start<=10:
-            arr=kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid",taskid).find()
+            arr=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).find()
             if arr:
                 start+=round(float(arr['start']),3)
                 if start>=0.01 and start <=99.99:
@@ -139,7 +139,7 @@ class Queues():
                         upddate={"start":start,'starts':starts,'updtime':int(time.time())}
                         if describes:
                             upddate['describes']=describes
-                        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid",taskid).update(upddate)
+                        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).update(upddate)
                     return True
                 else:
                     return False
@@ -184,7 +184,7 @@ class Queues():
             updtime=ttt
         task={"taskid":taskid,"title":title,"describes":describes,"code":2,"msg":msg,"error":"","start":start,"end":end,"addtime":ttt,'starts':0,'endtime':0,'updtime':updtime}
         key={"target":target,"args":args,"task":task}
-        kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").insert(task)
+        kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").insert(task)
         if types=='process':
             Queues.__processglobalqueue.put(key)
         else:
@@ -201,8 +201,8 @@ class Queues():
             model_kcwebs_tasks=model_kcwebs_task()
             model_kcwebs_tasks.create_table()
         try:
-            lists=kcwsqlite.sqlite.connect(queuesdbpath).where(where).table("model_kcwebs_queues").order("id desc").page(pagenow,pagesize).select()
-            count=kcwsqlite.sqlite.connect(queuesdbpath).where(where).table("model_kcwebs_queues").count()
+            lists=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).where(where).table("model_kcwebs_queues").order("id desc").page(pagenow,pagesize).select()
+            count=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).where(where).table("model_kcwebs_queues").count()
             return lists,count
         except:
             model_kcwebs_tasks=model_kcwebs_task()
@@ -215,7 +215,7 @@ class Queues():
 
         return dict
         """
-        arr=kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("taskid",taskid).find()
+        arr=kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("taskid",taskid).find()
         if arr:
             arr['start']=float(arr['start'])
             dqsjc=arr['updtime']-arr['addtime']
@@ -232,7 +232,7 @@ class Queues():
         
         return Boolean
         """
-        if kcwsqlite.sqlite.connect(queuesdbpath).table("model_kcwebs_queues").where("code","in",2,3).count():
+        if kcwsqlite.sqlite.connect(queuesdbpath,th_lock=True).table("model_kcwebs_queues").where("code","in",2,3).count():
             return True
         else:
             return False

{kcwebs-3.15 → kcwebs-3.16}/kcwebs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kcwebs
-Version: 3.15
+Version: 3.16
 Summary: kcwebs作为web开发而设计的高性能框架
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fk1402936534@qq.com
 License: MIT License
 Description: kcwebs作为web开发而设计的高性能框架，采用全新的架构思想，注重易用性。遵循MIT开源许可协议发布，意味着个人和企业可以免费使用kcwebs，甚至允许把你基于kcwebs开发的应用开源或商业产品发布或销售。完整文档请访问：https://docs.kwebapp.cn/index/index/2
-Keywords: kcwebs3.15
+Keywords: kcwebs3.16
 Platform: UNKNOWN

{kcwebs-3.15 → kcwebs-3.16}/kcwebs.egg-info/requires.txt

@@ -1,7 +1,7 @@
-kcws>=3.15
-kcwmysql>=3.15
-kcwsqlite>=3.15
-kcwhttp>=3.15
+kcws>=3.16
+kcwmysql>=3.16
+kcwsqlite>=3.16
+kcwhttp>=3.16
 python-dateutil==2.9.0
 pymongo==3.10.0
 Mako==1.3.6