zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 16:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix review

Browse Source
This commit is contained in:
sunxyw
2022-03-21 23:28:57 +08:00
parent bc7d5871e4
commit 8105892b6e
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZM/Event/EventManager.php
View File

@@ -83,9 +83,9 @@ class EventManager
} }
$conf = ZMConfig::get('global', 'worker_cache') ?? ['worker' => 0]; $conf = ZMConfig::get('global', 'worker_cache') ?? ['worker' => 0];
if (server()->worker_id == $conf['worker']) { if (server()->worker_id == $conf['worker']) {
run_repeating(static function () { zm_timer_tick(ZMConfig::get('global', 'light_cache')['auto_save_interval'] * 1000, static function () {
LightCache::savePersistence(); LightCache::savePersistence();
}, ZMConfig::get('global', 'light_cache')['auto_save_interval'] * 1000); });
} }
} }
} }

21
src/ZM/global_functions.php
View File

@@ -345,7 +345,7 @@ function zm_resume(int $cid)
* *
* @param int $delay 延迟时间，单位毫秒ms * @param int $delay 延迟时间，单位毫秒ms
*/ */
function run_later(callable $runnable, int $delay) function zm_timer_after(int $delay, callable $runnable)
{ {
Swoole\Timer::after($delay, static function () use ($runnable) { Swoole\Timer::after($delay, static function () use ($runnable) {
call_with_catch($runnable); call_with_catch($runnable);
@@ -358,7 +358,7 @@ function run_later(callable $runnable, int $delay)
* @param int $interval 间隔时间，单位毫秒ms * @param int $interval 间隔时间，单位毫秒ms
* @return false|int 定时器ID，失败返回false * @return false|int 定时器ID，失败返回false
*/ */
function run_repeating(callable $runnable, int $interval) function zm_timer_tick(int $interval, callable $runnable)
{ {
if (zm_cid() === -1) { if (zm_cid() === -1) {
return go(static function () use ($interval, $runnable) { return go(static function () use ($interval, $runnable) {
@@ -719,15 +719,6 @@ function onebot_target_id_name(string $message_type): string
return get_onebot_target_id_name($message_type); return get_onebot_target_id_name($message_type);
} }
/**
* @param mixed $ms
* @deprecated 已废弃，请使用 {@link run_repeating()}
*/
function zm_timer_tick($ms, callable $callable)
{
return run_repeating($callable, $ms);
}
/** /**
* @deprecated 已废弃，请直接使用 {@link call_with_catch()} * @deprecated 已废弃，请直接使用 {@link call_with_catch()}
*/ */
@@ -744,11 +735,3 @@ function zm_data_hash($v): string
{ {
return hash_message($v); return hash_message($v);
} }
/**
* @deprecated 已废弃，请使用 {@link run_later()}
*/
function zm_timer_after(int $ms, callable $callable)
{
run_later($callable, $ms);
}