Tg port 2 15 (#230)
* defines/helpers * globalvars, onclick, controllers * datums and game * woooooooooorld. Uh. dm * modules sans mobs client admin * modules/admin * pref shit * modules/mob * icon updates * extra things * Cherrypicked fixes from open PRs * metastation.tgm fix * a better meta fix * reverts async breakings
This commit is contained in:
Poojawa
+69
-24
@@ -10,31 +10,64 @@ import socket
|
||||
import sys
|
||||
import threading
|
||||
import logging
|
||||
import logging.handlers as handlers
|
||||
import signal
|
||||
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
global irc
|
||||
|
||||
# Set to false when we've been killed
|
||||
running = True
|
||||
# times we've attempted to connect to server
|
||||
con_attempts = 0
|
||||
|
||||
def print_err(msg):
|
||||
logging.error(msg)
|
||||
## Set up a logger object
|
||||
logger = logging.getLogger('minibot')
|
||||
logger.setLevel(logging.DEBUG)
|
||||
|
||||
# create a file handler (rolls over midnight, keeps 7 days of log
|
||||
handler = handlers.TimedRotatingFileHandler('minibot.log', when='midnight', backupCount=7)
|
||||
# most verbose
|
||||
handler.setLevel(logging.DEBUG)
|
||||
|
||||
#only send errors/notifications to the terminal
|
||||
iohandler = logging.StreamHandler()
|
||||
iohandler.setLevel(logging.INFO)
|
||||
|
||||
# create a logging format
|
||||
#time - name - level - message (string)
|
||||
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='%Y-%m-%d %H:%M')
|
||||
handler.setFormatter(formatter)
|
||||
iohandler.setFormatter(formatter)
|
||||
|
||||
#finally attach them to the logger object
|
||||
logger.addHandler(handler)
|
||||
logger.addHandler(iohandler)
|
||||
|
||||
|
||||
def setup_irc_socket():
|
||||
global irc, running, con_attempts, logger
|
||||
s = socket.socket()
|
||||
s.settimeout(240)
|
||||
|
||||
while 1:
|
||||
#why not reuse running here? because we want to break this loop if someone sigkills us
|
||||
connected = False
|
||||
while running and con_attempts < 3 and not connected:
|
||||
try:
|
||||
s.connect((server, port))
|
||||
except socket.error:
|
||||
print_err("Unable to connect to server {0}:{1}, attempting to reconnect in 20 seconds.".format(server, port))
|
||||
logger.exception("Unable to connect to server {0}:{1}, attempting to reconnect in 20 seconds, Attempt number:{2}".format(server, port, con_attempts))
|
||||
con_attempts += 1
|
||||
time.sleep(20)
|
||||
else:
|
||||
print_err("Connection established to server {0}:{1}.".format(server, port))
|
||||
break
|
||||
continue
|
||||
|
||||
s.send(bytes("NICK {0}\r\n".format(nick), "UTF-8"))
|
||||
s.send(bytes("USER {0} {1} {2} :{3}\r\n".format(ident, server, name, realname), "UTF-8"))
|
||||
logger.info("Connection established to server {0}:{1}.".format(server, port))
|
||||
connected = True
|
||||
|
||||
if connected:
|
||||
s.send(bytes("NICK {0}\r\n".format(nick), "UTF-8"))
|
||||
s.send(bytes("USER {0} {1} {2} :{3}\r\n".format(ident, server, name, realname), "UTF-8"))
|
||||
else:
|
||||
logger.error("Unable to connect, shutting down")
|
||||
running = False
|
||||
return s
|
||||
|
||||
|
||||
@@ -42,27 +75,28 @@ def setup_nudge_socket():
|
||||
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
s.bind(("", 45678)) # localhost:45678
|
||||
s.listen(5)
|
||||
logger.info("Nudge socket up and listening")
|
||||
return s
|
||||
|
||||
|
||||
def nudge_handler():
|
||||
global irc
|
||||
global irc, running, con_attempts, logger
|
||||
nudge = setup_nudge_socket()
|
||||
message_queue = collections.deque()
|
||||
while 1:
|
||||
while running:
|
||||
if len(message_queue):
|
||||
message = message_queue.popleft()
|
||||
else:
|
||||
try:
|
||||
s, ip = nudge.accept()
|
||||
except:
|
||||
print_err("Nudge socket lost, attempting to reopen.")
|
||||
logger.exception("Nudge socket lost, attempting to reopen.")
|
||||
nudge = setup_nudge_socket()
|
||||
continue
|
||||
rawdata = s.recv(1024)
|
||||
s.close()
|
||||
data = pickle.loads(rawdata)
|
||||
logging.info(data)
|
||||
logger.debug(data)
|
||||
if data["ip"][0] == "#":
|
||||
message = "{0} :AUTOMATIC ANNOUNCEMENT : {1}\r\n".format(data["ip"], str(" ".join(data["data"])))
|
||||
else:
|
||||
@@ -70,18 +104,18 @@ def nudge_handler():
|
||||
try:
|
||||
irc.send(bytes("PRIVMSG {0}".format(message), "UTF-8"))
|
||||
except:
|
||||
print_err("Nudge received without IRC socket, appending to queue.")
|
||||
print_err("Message: {0}".format(message))
|
||||
logger.exception("Nudge received without IRC socket, appending to queue.")
|
||||
logger.debug("Message: {0}".format(message))
|
||||
message_queue.append(message)
|
||||
|
||||
|
||||
def irc_handler():
|
||||
global irc
|
||||
while 1:
|
||||
global irc, running, con_attempts, logger
|
||||
while running:
|
||||
try:
|
||||
buf = irc.recv(1024).decode("UTF-8").split("\n")
|
||||
for i in buf:
|
||||
logging.info(i)
|
||||
logger.debug(i)
|
||||
if i[0:4] == "PING":
|
||||
irc.send(bytes("PONG {0}\r\n".format(i[5:]), "UTF-8"))
|
||||
else:
|
||||
@@ -89,29 +123,40 @@ def irc_handler():
|
||||
if len(l) < 2:
|
||||
continue
|
||||
elif l[1] == "001":
|
||||
print_err("connected and registered, identifing and joining channels")
|
||||
logger.info("connected and registered, identifing and joining channels")
|
||||
irc.send(bytes("PRIVMSG NickServ :IDENTIFY {0}\r\n".format(password), "UTF-8"))
|
||||
time.sleep(1)
|
||||
for channel in channels:
|
||||
irc.send(bytes("JOIN {0}\r\n".format(channel), "UTF-8"))
|
||||
elif l[1] == "477":
|
||||
print_err("Error: Nickname was not registered when joining {0}. Reauthing and retrying...".format(l[3]))
|
||||
logger.error("Error: Nickname was not registered when joining {0}. Reauthing and retrying...".format(l[3]))
|
||||
irc.send(bytes("PRIVMSG NickServ :IDENTIFY {0}\r\n".format(password), "UTF-8"))
|
||||
time.sleep(5)
|
||||
irc.send(bytes("JOIN {0}\r\n".format(l[3]), "UTF-8"))
|
||||
elif l[1] == "433":
|
||||
print_err("Error: Nickname already in use. Attempting to use alt nickname if available, sleeping 60s otherwise...")
|
||||
logger.error("Error: Nickname already in use. Attempting to use alt nickname if available, sleeping 60s otherwise...")
|
||||
if(altnick):
|
||||
irc.send(bytes("NICK {0}\r\n".format(altnick), "UTF-8"))
|
||||
else:
|
||||
time.sleep(60)
|
||||
irc = setup_irc_socket()
|
||||
except InterruptedError as e:
|
||||
logger.exception("Interrupted, probably killed.")
|
||||
continue
|
||||
except:
|
||||
print_err("Lost connection to IRC server.")
|
||||
logger.exception("Lost connection to IRC server.")
|
||||
irc = setup_irc_socket()
|
||||
|
||||
def signal_handler(signum, frame):
|
||||
global irc, running, con_attempts, logger
|
||||
logger.info("Recieved term kill, closing")
|
||||
running = False
|
||||
|
||||
if __name__ == "__main__":
|
||||
#listen to signals (quit on ctrl c or kill from OS)
|
||||
signal.signal(signal.SIGINT, signal_handler)
|
||||
signal.signal(signal.SIGTERM, signal_handler)
|
||||
signal.signal(signal.SIGQUIT, signal_handler)
|
||||
irc = setup_irc_socket()
|
||||
t = threading.Thread(target=nudge_handler)
|
||||
t.daemon = True
|
||||
|
||||
Reference in New Issue
Block a user