Allow threads to be stopped externally
This commit is contained in:
parent
46b544fac6
commit
15afa90157
1 changed files with 10 additions and 9 deletions
|
@ -1,6 +1,7 @@
|
|||
import re
|
||||
import enum
|
||||
import socket
|
||||
import threading
|
||||
import datetime
|
||||
import fnmatch
|
||||
import traceback
|
||||
|
@ -38,7 +39,7 @@ class Session(Connection):
|
|||
self.server = server
|
||||
self.db: Database = server.connect_to_db()
|
||||
self.mode: SessionMode = SessionMode.READER
|
||||
self.active: bool = True
|
||||
self.stop: threading.Event = threading.Event()
|
||||
|
||||
self.newsgroup: Optional[Newsgroup] = None
|
||||
self.user: Optional[User] = None
|
||||
|
@ -767,7 +768,7 @@ class Session(Connection):
|
|||
line = self.readline()
|
||||
|
||||
if line == '':
|
||||
self.active = False
|
||||
if self.stop.is_set():
|
||||
break
|
||||
|
||||
stripped = line.rstrip()
|
||||
|
@ -799,7 +800,7 @@ class Session(Connection):
|
|||
timestamp.strftime("%Y%m%d%H%M%S"))
|
||||
|
||||
def _cmd_quit(self):
|
||||
self.active = False
|
||||
self.stop.set()
|
||||
|
||||
return self.respond(ResponseCode.NNTP_CONNECTION_CLOSING)
|
||||
|
||||
|
@ -835,7 +836,7 @@ class Session(Connection):
|
|||
line = self.readline()
|
||||
|
||||
if line == '':
|
||||
self.active = False
|
||||
self.stop.set()
|
||||
return
|
||||
|
||||
tokens = self.RE_SPLIT.split(line.rstrip())
|
||||
|
@ -858,7 +859,7 @@ class Session(Connection):
|
|||
self.greet()
|
||||
|
||||
try:
|
||||
while self.active:
|
||||
while not self.stop.is_set():
|
||||
self.handle_command()
|
||||
|
||||
self.sock.close()
|
||||
|
|
Loading…
Add table
Reference in a new issue