nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Improve logging system

Browse source
This commit is contained in:
nemunaire 2014-08-27 07:57:00 +02:00
commit e5ec487d29
12 changed files with 75 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/DCC.py
View file

@ -81,7 +81,7 @@ class DCC(server.Server):
self.s = socket.socket()
try:
self.s.connect((host, port))
self.logger.info("Accepted user from %s:%d for %s" % (host, port, self.sender))
self.logger.info("Accepted user from %s:%d for %s", host, port, self.sender)
self.connected = True
self.stop = False
except:
@ -106,7 +106,7 @@ class DCC(server.Server):
self.setError("Une erreur s'est produite durant la tentative"
" d'ouverture d'une session DCC.")
return False
self.logger.info("Listening on %d for %s" % (self.port, self.sender))
self.logger.info("Listening on %d for %s", self.port, self.sender)
#Send CTCP request for DCC
self.srv.send_ctcp(self.sender,
@ -117,7 +117,7 @@ class DCC(server.Server):
s.listen(1)
#Waiting for the client
(self.s, addr) = s.accept()
self.logger.info("Connected by %d" % addr)
self.logger.info("Connected by %d", addr)
self.connected = True
return True
@ -151,7 +151,7 @@ class DCC(server.Server):
except RuntimeError:
pass
else:
self.logger.error("File not found `%s'" % filename)
self.logger.error("File not found `%s'", filename)
def run(self):
self.stopping.clear()
@ -204,7 +204,7 @@ class DCC(server.Server):
if self.realname in self.srv.dcc_clients:
del self.srv.dcc_clients[self.realname]
self.logger.info("Closing connection with " + self.nick)
self.logger.info("Closing connection with %s", self.nick)
self.stopping.set()
if self.closing_event is not None:
self.closing_event()

19
server/IRC.py
View file

@ -173,8 +173,8 @@ class IRCServer(server.Server):
self.s.connect((self.host, self.port)) #Connect to server
except socket.error as e:
self.s = None
self.logger.critical("Unable to connect to %s:%d: %s"
% (self.host, self.port, os.strerror(e.errno)))
self.logger.critical("Unable to connect to %s:%d: %s",
self.host, self.port, os.strerror(e.errno))
return
self.stopping.clear()
@ -185,10 +185,10 @@ class IRCServer(server.Server):
self.realname)).encode())
raw = self.s.recv(1024)
if not raw:
self.logger.critical("Unable to connect to %s:%d" % (self.host, self.port))
self.logger.critical("Unable to connect to %s:%d", self.host, self.port)
return
self.connected = True
self.logger.info("Connection to %s:%d completed" % (self.host, self.port))
self.logger.info("Connection to %s:%d completed", self.host, self.port)
if len(self.channels) > 0:
for chn in self.channels.keys():
@ -214,7 +214,7 @@ class IRCServer(server.Server):
self.connected = False
if self.closing_event is not None:
self.closing_event()
self.logger.info("Server `%s' successfully stopped." % self.id)
self.logger.info("Server `%s' successfully stopped.", self.id)
self.stopping.set()
# Rearm Thread
threading.Thread.__init__(self)
@ -255,17 +255,14 @@ class IRCServer(server.Server):
"""Send a message without checks or format"""
#TODO: add something for post message treatment here
if channel == self.nick:
self.logger.warn("Nemubot talks to himself: %s" % msg)
self.logger.debug(traceback.print_stack())
self.logger.warn("Nemubot talks to himself: %s", msg, stack_info=True)
if line is not None and channel is not None:
if self.s is None:
self.logger.warn("Attempt to send message on a non connected server: %s: %s" % (self.id, line))
self.logger.debug(traceback.format_stack())
self.logger.warn("Attempt to send message on a non connected server: %s: %s", self.id, line, stack_info=True)
elif len(line) < 442:
self.s.send(("%s %s :%s%s" % (cmd, channel, line, endl)).encode ())
else:
self.logger.warn("Message truncated due to size (%d ; max : 442) : %s" % (len(line), line))
self.logger.debug(traceback.format_stack())
self.logger.warn("Message truncated due to size (%d ; max : 442) : %s", len(line), line, stack_info=True)
self.s.send (("%s %s :%s%s" % (cmd, channel, line[0:442]+"<…>", endl)).encode ())
def send_msg_usr(self, user, msg):

2
server/__init__.py
View file

@ -30,7 +30,7 @@ class Server(threading.Thread):
self.moremessages = dict()
self.logger = logging.getLogger(__name__ + "/" + self.id)
self.logger = logging.getLogger("nemubot.server." + self.id)
threading.Thread.__init__(self)