Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Remove usage of sys.stderr in IRCBot.py, change disconnect logs from info to

Browse source 
`warn`
This commit is contained in:
jesopo 2018-12-02 09:43:57 +00:00
parent 9a311c88b6
commit cbc3ae3432
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/IRCBot.py
View file

@ -1,4 +1,4 @@
import queue, os, select, socket, sys, threading, time, traceback, typing, uuid import queue, os, select, socket, threading, time, traceback, typing, uuid
from src import EventManager, Exports, IRCServer, Logging, ModuleManager from src import EventManager, Exports, IRCServer, Logging, ModuleManager
from src import Socket, utils from src import Socket, utils
@ -91,8 +91,8 @@ class Bot(object):
try: try:
server.connect() server.connect()
except: except:
sys.stderr.write("Failed to connect to %s\n" % str(server)) self.log.warn("Failed to connect to %s", [str(server)],
traceback.print_exc() exc_info=True)
return False return False
self.servers[server.fileno()] = server self.servers[server.fileno()] = server
self.poll.register(server.fileno(), select.EPOLLOUT) self.poll.register(server.fileno(), select.EPOLLOUT)
@ -217,12 +217,12 @@ class Bot(object):
if sock.fileno() in self.servers: if sock.fileno() in self.servers:
self.register_read(sock) self.register_read(sock)
elif event & select.EPULLHUP: elif event & select.EPULLHUP:
self.log.info("Recieved EPOLLHUP for %s", [str(sock)]) self.log.warn("Recieved EPOLLHUP for %s", [str(sock)])
sock.disconnect() sock.disconnect()
for server in list(self.servers.values()): for server in list(self.servers.values()):
if server.read_timed_out(): if server.read_timed_out():
self.log.info("Pinged out from %s", [str(server)]) self.log.warn("Pinged out from %s", [str(server)])
server.disconnect() server.disconnect()
elif server.ping_due() and not server.ping_sent: elif server.ping_due() and not server.ping_sent:
server.send_ping() server.send_ping()
@ -235,7 +235,7 @@ class Bot(object):
reconnect_delay = self.config.get("reconnect-delay", 10) reconnect_delay = self.config.get("reconnect-delay", 10)
self._timers.add("reconnect", reconnect_delay, self._timers.add("reconnect", reconnect_delay,
server_id=server.id) server_id=server.id)
self.log.info( self.log.warn(
"Disconnected from %s, reconnecting in %d seconds", "Disconnected from %s, reconnecting in %d seconds",
[str(server), reconnect_delay]) [str(server), reconnect_delay])
elif server.waiting_send() and server.throttle_done(): elif server.waiting_send() and server.throttle_done():