Skip to content

Commit 0824928

Browse files
WilliamBergaminClaude
andauthored
fix(socket_mode): shut down current_session_runner in built-in close() (#1962)
Co-authored-by: Claude <svc-devxp-claude@slack-corp.com>
1 parent c30a05d commit 0824928

2 files changed

Lines changed: 26 additions & 1 deletion

File tree

‎slack_sdk/socket_mode/builtin/client.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,13 @@ def send_message(self, message: str) -> None:
221221
)
222222
raise e
223223

224-
def close(self):
224+
def close(self) -> None:
225225
self.closed = True
226226
self.auto_reconnect_enabled = False
227+
self.current_session_state.terminated = True
227228
self.disconnect()
229+
if self.current_session_runner.is_alive():
230+
self.current_session_runner.shutdown()
228231
if self.current_app_monitor.is_alive():
229232
self.current_app_monitor.shutdown()
230233
if self.message_processor.is_alive():

‎tests/slack_sdk/socket_mode/test_interactions_builtin.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,25 @@ def test_send_message_while_disconnection(self):
145145
client.send_message("foo")
146146
finally:
147147
client.close()
148+
149+
def test_close_reaps_current_session_runner(self):
150+
# Regression for #1873: close() must reap current_session_runner without hanging.
151+
client = SocketModeClient(
152+
app_token="xapp-A111-222-xyz",
153+
web_client=self.web_client,
154+
auto_reconnect_enabled=False,
155+
trace_enabled=True,
156+
)
157+
try:
158+
client.wss_uri = "ws://0.0.0.0:3011/link"
159+
client.connect()
160+
self.assertTrue(client.is_connected())
161+
time.sleep(1)
162+
163+
client.close()
164+
165+
self.assertFalse(client.current_session_runner.is_alive())
166+
self.assertFalse(client.current_app_monitor.is_alive())
167+
self.assertFalse(client.message_processor.is_alive())
168+
finally:
169+
client.close()

0 commit comments

Comments
 (0)