From 2cb390ec64f3e2dcc066973987dcce762b0dc5d5 Mon Sep 17 00:00:00 2001 From: "enus.linden" Date: Tue, 14 Oct 2008 17:08:19 +0000 Subject: [PATCH] adding some minimal logging to messaging --- pyogp/lib/base/message/udpdeserializer.py | 6 ++++++ pyogp/lib/base/message/udpdispatcher.py | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/pyogp/lib/base/message/udpdeserializer.py b/pyogp/lib/base/message/udpdeserializer.py index 34a68c3..0448993 100644 --- a/pyogp/lib/base/message/udpdeserializer.py +++ b/pyogp/lib/base/message/udpdeserializer.py @@ -20,6 +20,7 @@ $/LicenseInfo$ #standard libs import struct +from logging import getLogger, CRITICAL, ERROR, WARNING, INFO, DEBUG import grokcore.component as grok from zope.component import getUtility @@ -34,6 +35,9 @@ from interfaces import IUDPPacket from pyogp.lib.base import exc +logger = getLogger('...base.message.udpdeserializer') +log = logger.log + class UDPPacketDeserializer(grok.Adapter): grok.implements(IDeserialization) grok.context(str) @@ -69,6 +73,8 @@ class UDPPacketDeserializer(grok.Adapter): if self.current_template != None: return True + log(INFO, "Received unknown packet: '%s', packet is not in our message_template" % (header)) + return False def __decode_header(self, header): diff --git a/pyogp/lib/base/message/udpdispatcher.py b/pyogp/lib/base/message/udpdispatcher.py index f16ef1e..5189016 100644 --- a/pyogp/lib/base/message/udpdispatcher.py +++ b/pyogp/lib/base/message/udpdispatcher.py @@ -17,6 +17,7 @@ http://svn.secondlife.com/svn/linden/projects/2008/pyogp/LICENSE.txt $/LicenseInfo$ """ +from logging import getLogger, CRITICAL, ERROR, WARNING, INFO, DEBUG from zope.interface import implements from zope.component import getUtility @@ -32,6 +33,9 @@ from interfaces import IUDPDispatcher, IUDPPacket from message import Message, Block from pyogp.lib.base import exc +logger = getLogger('...base.message.udpdispatcher') +log = logger.log + #maybe make a global utility class UDPDispatcher(object): implements(IUDPDispatcher) @@ -86,6 +90,8 @@ class UDPDispatcher(object): circuit.handle_packet(recv_packet) + log(DEBUG, 'Received packet: %s' % (recv_packet.name)) + return recv_packet def send_reliable(self, message, host, retries): @@ -127,6 +133,7 @@ class UDPDispatcher(object): #TODO: remove this when testing a network self.udp_client.send_packet(self.socket, send_buffer, host) + log(DEBUG, 'Sent packet: %s' % (message.name)) return send_buffer