1
- import time
2
1
from typing import Tuple
3
2
import grpc
4
3
from concurrent import futures
@@ -47,13 +46,8 @@ def CloseServer(self, request, context):
47
46
print (f"Received CloseServer request from { self .ai .bot_name } . Shutting down server..." )
48
47
context .set_code (grpc .StatusCode .OK )
49
48
context .set_details (f"Bot { self .ai .bot_name } 's connection closed." )
50
- def delayed_shutdown ():
51
- time .sleep (0.1 )
52
- self .server_instance .bot_disconnected ()
53
- print (f"Bot { self .ai .bot_name } 's connection closed." )
54
-
55
- import threading
56
- threading .Thread (target = delayed_shutdown , daemon = True ).start ()
49
+ self .server_instance .bot_disconnected ()
50
+ print (f"Bot { self .ai .bot_name } 's connection closed." )
57
51
58
52
return main_pb2 .Empty ()
59
53
@@ -74,7 +68,7 @@ def bot_disconnected(self):
74
68
75
69
def shutdown_server (self ):
76
70
if self .server :
77
- self .server .stop (0 )
71
+ self .server .stop (2 )
78
72
else :
79
73
print ("Server is already stopped." )
80
74
@@ -108,12 +102,6 @@ def run_grpc_server(
108
102
server2 .server .start ()
109
103
110
104
if bot1 is not None :
111
- try :
112
- server1 .server .wait_for_termination (timeout = 2 )
113
- except grpc .FutureTimeoutError :
114
- print ("Server didn't terminate cleanly in time." )
105
+ server1 .server .wait_for_termination ()
115
106
if bot2 is not None :
116
- try :
117
- server2 .server .wait_for_termination (timeout = 2 )
118
- except grpc .FutureTimeoutError :
119
- print ("Server didn't terminate cleanly in time." )
107
+ server2 .server .wait_for_termination ()
0 commit comments