nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Local client now detects when server close the connection

Browse Source
This commit is contained in:
nemunaire 2017-06-23 21:20:32 +02:00
parent 02838658b0
commit 8b6f72587d
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
nemubot/__init__.py
View File

@ -53,41 +53,50 @@ def attach(pid, socketfile):
sys.stderr.write("\n") sys.stderr.write("\n")
return 1 return 1
from select import select import select
mypoll = select.poll()
mypoll.register(sys.stdin.fileno(), select.POLLIN | select.POLLPRI)
mypoll.register(sock.fileno(), select.POLLIN | select.POLLPRI)
try: try:
while True: while True:
rl, wl, xl = select([sys.stdin, sock], [], []) for fd, flag in mypoll.poll():
if flag & (select.POLLERR | select.POLLHUP | select.POLLNVAL):
sock.close()
print("Connection closed.")
return 1
if sys.stdin in rl: if fd == sys.stdin.fileno():
line = sys.stdin.readline().strip() line = sys.stdin.readline().strip()
if line == "exit" or line == "quit": if line == "exit" or line == "quit":
return 0 return 0
elif line == "reload": elif line == "reload":
import os, signal import os, signal
os.kill(pid, signal.SIGHUP) os.kill(pid, signal.SIGHUP)
print("Reload signal sent. Please wait...") print("Reload signal sent. Please wait...")
elif line == "shutdown": elif line == "shutdown":
import os, signal import os, signal
os.kill(pid, signal.SIGTERM) os.kill(pid, signal.SIGTERM)
print("Shutdown signal sent. Please wait...") print("Shutdown signal sent. Please wait...")
elif line == "kill": elif line == "kill":
import os, signal import os, signal
os.kill(pid, signal.SIGKILL) os.kill(pid, signal.SIGKILL)
print("Signal sent...") print("Signal sent...")
return 0 return 0
elif line == "stack" or line == "stacks": elif line == "stack" or line == "stacks":
import os, signal import os, signal
os.kill(pid, signal.SIGUSR1) os.kill(pid, signal.SIGUSR1)
print("Debug signal sent. Consult logs.") print("Debug signal sent. Consult logs.")
else: else:
sock.send(line.encode() + b'\r\n') sock.send(line.encode() + b'\r\n')
if fd == sock.fileno():
sys.stdout.write(sock.recv(2048).decode())
if sock in rl:
sys.stdout.write(sock.recv(2048).decode())
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
except: except: