Optimize code for setting heartbeat_idle_time

matyhtf · matyhtf · commit 4eed1a6da8af · 2021-05-26T17:42:56.000+08:00
diff --git a/ext-src/swoole_server.cc b/ext-src/swoole_server.cc
@@ -2390,7 +2390,8 @@ static PHP_METHOD(swoole_server, set) {
             php_swoole_fatal_error(E_WARNING, "heartbeat_idle_time must be greater than heartbeat_check_interval");
             serv->heartbeat_check_interval = serv->heartbeat_idle_time / 2;
         }
-    } else if (serv->heartbeat_check_interval > 0) {
+    }
+    if (serv->heartbeat_idle_time == 0 && serv->heartbeat_check_interval > 0) {
         serv->heartbeat_idle_time = serv->heartbeat_check_interval * 2;
     }
     // max_request

Original file line number	Diff line number	Diff line change
`@@ -2390,7 +2390,8 @@ static PHP_METHOD(swoole_server, set) {`
`2390`	`2390`	`php_swoole_fatal_error(E_WARNING, "heartbeat_idle_time must be greater than heartbeat_check_interval");`
`2391`	`2391`	`serv->heartbeat_check_interval = serv->heartbeat_idle_time / 2;`
`2392`	`2392`	`}`
`2393`		`- } else if (serv->heartbeat_check_interval > 0) {`
	`2393`	`+ }`
	`2394`	`+ if (serv->heartbeat_idle_time == 0 && serv->heartbeat_check_interval > 0) {`
`2394`	`2395`	`serv->heartbeat_idle_time = serv->heartbeat_check_interval * 2;`
`2395`	`2396`	`}`
`2396`	`2397`	`// max_request`