fix tests

swoole · Sep 13, 2024 · ff01b0f · ff01b0f
1 parent 573a67e
commit ff01b0f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/server/master.cc b/src/server/master.cc
@@ -925,7 +925,9 @@ void Server::stop_master_thread() {
         if (port->is_dgram() and is_process_mode()) {
             continue;
         }
-        reactor->del(port->socket);
+        if (!port->socket->removed) {
+            reactor->del(port->socket);
+        }
     }
     if (pipe_command) {
         reactor->del(pipe_command->get_socket(true));

diff --git a/src/server/reactor_thread.cc b/src/server/reactor_thread.cc
@@ -310,7 +310,9 @@ void ReactorThread::shutdown(Reactor *reactor) {
                 if (ls->socket->fd % serv->reactor_num != reactor->id) {
                     continue;
                 }
-                reactor->del(ls->socket);
+                if (!ls->socket->removed) {
+                    reactor->del(ls->socket);
+                }
             }
         }
     }

diff --git a/tests/swoole_server/task/finish_timeout.phpt b/tests/swoole_server/task/finish_timeout.phpt
@@ -65,4 +65,4 @@ unlink(TMP_LOG_FILE);
 ?>
 --EXPECTF--
 [%s]	WARNING	Socket::send_blocking(): send %d bytes failed, Error: Resource temporarily unavailable[11]
-[%s]	WARNING	Server::reply_task_result() (ERRNO %d): send result to worker timed out
+[%s]	WARNING	Server::finish() (ERRNO %d): send result to worker timed out