This commit is contained in:
2021-09-07 14:45:10 +08:00
parent 25f36fc3da
commit 8844131a0b
+8 -6
View File
@@ -67,16 +67,16 @@ class Redis implements StopHeartbeatCheck
*/ */
public function heartbeat_check(): void public function heartbeat_check(): void
{ {
if (env('state','start') == 'exit') { if (env('state', 'start') == 'exit') {
return; return;
} }
if ($this->_timer === -1 && Context::inCoroutine()) { if ($this->_timer === -1 && Context::inCoroutine()) {
$this->_timer = Timer::tick(1000, function () { $this->_timer = Timer::tick(1000, function () {
try { try {
if (env('state','start') == 'exit') { if (env('state', 'start') == 'exit') {
Kiri::getDi()->get(Logger::class)->critical('timer end'); Kiri::getDi()->get(Logger::class)->critical('timer end');
$this->stopHeartbeatCheck(); $this->stopHeartbeatCheck();
} }
if (time() - $this->_last > 10 * 60) { if (time() - $this->_last > 10 * 60) {
$this->stopHeartbeatCheck(); $this->stopHeartbeatCheck();
$this->pdo = null; $this->pdo = null;
@@ -150,7 +150,9 @@ class Redis implements StopHeartbeatCheck
$this->read_timeout = 0; $this->read_timeout = 0;
} }
$redis->select($this->database); $redis->select($this->database);
$redis->setOption(\Redis::OPT_READ_TIMEOUT, $this->read_timeout); if ($this->read_timeout > 0) {
$redis->setOption(\Redis::OPT_READ_TIMEOUT, $this->read_timeout);
}
$redis->setOption(\Redis::OPT_PREFIX, $this->prefix); $redis->setOption(\Redis::OPT_PREFIX, $this->prefix);
return $redis; return $redis;