cobweb-launcher 1.2.3__tar.gz → 1.2.5__tar.gz

{cobweb-launcher-1.2.3/cobweb_launcher.egg-info → cobweb-launcher-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.2.3
+Version: 1.2.5
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.2.3 → cobweb-launcher-1.2.5}/cobweb/launchers/launcher.py

@@ -40,6 +40,7 @@ class Launcher(threading.Thread):
         self.task = task
         self.project = project
 
+        self._app_time = int(time.time())
         self._stop = threading.Event()  # 结束事件
         self._pause = threading.Event()  # 暂停事件
 

{cobweb-launcher-1.2.3 → cobweb-launcher-1.2.5}/cobweb/launchers/launcher_pro.py

@@ -16,8 +16,8 @@ class LauncherPro(Launcher):
         self._fail_key = "{%s:%s}:fail" % (project, task)
         self._heartbeat_key = "heartbeat:%s_%s" % (project, task)
         self._reset_lock_key = "lock:reset:%s_%s" % (project, task)
-        self._statistics_done_key = "{%s:%s}:statistics:done" % (project, task)
-        self._statistics_fail_key = "{%s:%s}:statistics:fail" % (project, task)
+        self._statistics_done_key = "statistics:%s:%s:done" % (project, task)
+        self._statistics_fail_key = "statistics:%s:%s:fail" % (project, task)
         self._db = RedisDB()
 
         self._heartbeat_start_event = threading.Event()
@@ -27,11 +27,11 @@ class LauncherPro(Launcher):
     def heartbeat(self):
         return self._db.exists(self._heartbeat_key)
 
-    def statistics(self, key, count, expire_time):
-        if self._db.exists(key):
-            self._db._client.incrby(key, count)
+    def statistics(self, key, count):
+        if not self._task_model and not self._db.exists(key):
+            self._db.setex(key, 86400 * 30, int(count))
         else:
-            self._db.setex(key, expire_time, int(count))
+            self._db._client.incrby(key, count)
 
     def _execute_heartbeat(self):
         while not self._stop.is_set():
@@ -133,15 +133,15 @@ class LauncherPro(Launcher):
                     seeds.append(seed.to_string)
             if seeds:
                 count = self._db.zrem(self._todo_key, *seeds)
-                self.statistics(self._statistics_done_key, count, 86400 * 30)
+                self.statistics(self._statistics_done_key, count)
                 self._remove_doing_seeds(seeds)
             if s_seeds:
                 count = self._db.done([self._todo_key, self._done_key], *s_seeds)
-                self.statistics(self._statistics_done_key, count, 86400 * 30)
+                self.statistics(self._statistics_done_key, count)
                 self._remove_doing_seeds(s_seeds)
             if f_seeds:
                 count = self._db.done([self._todo_key, self._fail_key], *f_seeds)
-                self.statistics(self._statistics_fail_key, count, 86400 * 30)
+                self.statistics(self._statistics_fail_key, count)
                 self._remove_doing_seeds(f_seeds)
 
             if status:

{cobweb-launcher-1.2.3 → cobweb-launcher-1.2.5/cobweb_launcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.2.3
+Version: 1.2.5
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb-launcher-1.2.3 → cobweb-launcher-1.2.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="cobweb-launcher",
-    version="1.2.3",
+    version="1.2.5",
     packages=find_packages(),
     url="https://github.com/Juannie-PP/cobweb",
     license="MIT",