diff --git a/System/Crontab/Producer.php b/System/Crontab/Producer.php index 7393999c..00b4454c 100644 --- a/System/Crontab/Producer.php +++ b/System/Crontab/Producer.php @@ -34,14 +34,15 @@ class Producer extends Component throw new Exception('Cache key ' . self::CRONTAB_KEY . ' types error.'); } - $tickTime = time() + $crontab->getTickTime(); $redis->del('stop:crontab:' . $name, 120); - - $result = $redis->zAdd(self::CRONTAB_KEY, $tickTime, $name); - var_dump($result, $redis->zCard(self::CRONTAB_KEY)); - if ($result) { - $redis->set('crontab:' . $name, swoole_serialize($crontab)); + if ($redis->exists('crontab:' . $name)) { + $redis->del('crontab:' . $name); } + + $tickTime = time() + $crontab->getTickTime(); + + $redis->zAdd(self::CRONTAB_KEY, $tickTime, $name); + $redis->set('crontab:' . $name, swoole_serialize($crontab)); } diff --git a/System/Crontab/Zookeeper.php b/System/Crontab/Zookeeper.php index 36d51abd..52b2448a 100644 --- a/System/Crontab/Zookeeper.php +++ b/System/Crontab/Zookeeper.php @@ -91,8 +91,7 @@ class Zookeeper extends Process $startTime = time(); $range = $redis->zRangeByScore(Producer::CRONTAB_KEY, '0', (string)$startTime); - var_dump($startTime, $range); -// $redis->zRemRangeByScore(Producer::CRONTAB_KEY, '0', (string)$startTime); + $redis->zRem(Producer::CRONTAB_KEY, ...$range); return [$range, $redis]; }