Changeset 131

Timestamp:

08/30/04 14:57:12 (4 years ago)

Author:

jajcus

Message:

- debug messages switched to 'logging' module

Files:

• trunk/jjigw.py (modified) (2 diffs)
• trunk/jjigw/channel.py (modified) (13 diffs)
• trunk/jjigw/component.py (modified) (13 diffs)
• trunk/jjigw/ircsession.py (modified) (16 diffs)
• trunk/jjigw/ircuser.py (modified) (5 diffs)
• trunk/jjigw/spidentd.py (modified) (3 diffs)

trunk/jjigw.py

@@ -18 +18 @@
-#  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
+import sys
+import os.path
+import logging
-
-from jjigw.common import JJIGWFatalError
-from jjigw.config import Config
-from jjigw.component import Component
-import sys
-import os.path
-
-def main(profile=False):
@@ -29 +30 @@
-
-    try:
+        logger=logging.getLogger()
+        logger.addHandler(logging.StreamHandler())
+        logger.setLevel(logging.DEBUG)
-        try:
-            config=Config(config_dir,data_dir)

trunk/jjigw/channel.py

@@ -19 +19 @@
-
-import string
+import logging
-
-from pyxmpp import Message,JID
@@ -33 +34 @@
-    multiarg_modes="OovbeI"
-    def __init__(self,session,name):
+        self.__logger=logging.getLogger("jjigw.Channel")
-        if not channel_re.match(name):
-            raise ValueError,"Bad channel name"
@@ -74 +76 @@
-    def join(self,stanza):
-        if self.state:
-
+__logger.
-            p=stanza.make_error_response(stanza,"bad-request")
-            self.session.component.send(p)
-            return
-        self.room_jid=stanza.get_to()
-
+__logger.
-        self.session.send("JOIN %s" % (self.name,))
-        self.requests.add("JOIN",stanza)
@@ -89 +91 @@
-        status=stanza.get_status()
-        if not self.state:
-
+__logger.
-        else:
-            if not status:
@@ -143 +145 @@
-
-    def nick_changed(self,oldnick,user):
-
+__logger.
-        p_unaval=self.get_user_presence(user,nick=user.nick,status=303)
-        p_unaval.set_type("unavailable")
@@ -243 +245 @@
-    def irc_cmd_MODE(self,prefix,command,params):
-        if len(params)<2:
-
+__logger.
-            return
-        params_str=string.join(params[2:]," ").strip()
@@ -276 +278 @@
-                continue
-            elif not pm:
-
+__logger.
-                continue
-            elif m in self.arg_modes or m in self.multiarg_modes:
-                if not len(params):
-
+__logger.
-                    continue
-                arg=params.pop(0)
@@ -286 +288 @@
-                arg=None
-            else:
-
+__logger.
-                continue
-            if m in "oOv":
@@ -307 +309 @@
-        else:
-            actor_jid=None
-
+__logger.
-        p=self.get_user_presence(user,actor_jid)
-        if actor:
@@ -329 +331 @@
-        if nprefix==nnick or nprefix.startswith(nnick+"!"):
-            if self.state=="join":
-
+__logger.
-                self.session.user.sync_delay+=1
-                try:
@@ -387 +389 @@
-    def irc_message(self,prefix,command,params):
-        if not self.state or len(params)<2:
-
+__logger.
-            return
-        body=unicode(params[1],self.encoding,"replace")
@@ -407 +409 @@
-            self.session.component.send(m)
-        else:
-
+__logger.
-
-    def change_topic(self,topic,stanza):
@@ -479 +481 @@
-        return "<IRCChannel %r>" % (self.name,)
-
-    def debug(self,msg):
-        return self.session.debug(msg)
-
-# vi: sts=4 et sw=4

trunk/jjigw/component.py

@@ -22 +22 @@
-import threading
-import string
+import logging
-
-import pyxmpp.jabberd
@@ -37 +38 @@
-                config.connect.secret,config.connect.host,config.connect.port,
-                category="gateway",type="irc")
+        self.__logger=logging.getLogger("jjigw.Component")
-        self.profile=profile
-        self.shutdown=0
@@ -56 +58 @@
-        user_jid=sess.jid
-        component_jid=sess.network.jid
-
+__logger.
-        self.irc_sessions[user_jid.as_unicode(),component_jid.domain]=sess
-
@@ -62 +64 @@
-        user_jid=sess.jid
-        component_jid=sess.network.jid
-
+__logger.
-        try:
-            del self.irc_sessions[user_jid.as_unicode(),component_jid.domain]
-        except KeyError:
-
+__logger.
-
-    def signal_handler(self,signum,frame):
-
+__logger.
-        self.shutdown=1
-
@@ -82 +84 @@
-                    raise
-                except:
-print_exception(
+__logger.exception("Exception cought:"
-        finally:
-            if self.shutdown:
@@ -99 +101 @@
-                    pass
-            self.disconnect()
-
+__logger.
-
-    def send(self,stanza):
@@ -123 +125 @@
-        fr=iq.get_from()
-        if not to.node:
-
+__logger.
-            iq=iq.make_error_response("feature-not-implemented")
-            self.stream.send(iq)
-            return 1
-        if to.resource or not (to.node[0] in "#+!" or to.node.startswith(",amp,")):
-
+__logger.
-            iq=iq.make_error_response("not-acceptable")
-            self.stream.send(iq)
@@ -136 +138 @@
-        sess=self.get_session(fr,to)
-        if not sess:
-
+__logger.
-            iq=iq.make_error_response("recipient-unavailable")
-            self.stream.send(iq)
@@ -143 +145 @@
-        channel=sess.get_channel(to)
-        if not channel:
-
+__logger.
-            iq=iq.make_error_response("recipient-unavailable")
-            self.stream.send(iq)
@@ -150 +152 @@
-        query=iq.get_muc_child()
-        if not isinstance(query,MucAdminQuery):
-
+__logger.
-            iq=iq.make_error_response("bad-request")
-            self.stream.send(iq)
@@ -157 +159 @@
-        items=query.get_items()
-        if not items:
-
+__logger.
-            iq=iq.make_error_response("bad-request")
-            self.stream.send(iq)
@@ -171 +173 @@
-            channel.op_user(item.nick,iq)
-        else:
-
+__logger.
-            iq=iq.make_error_response("feature-not-implemented")
-            self.stream.send(iq)
@@ -259 +261 @@
-        to=stanza.get_to()
-        if not to.node:
-
+__logger.
-            return 0
-        if to.node[0] not in "#+!" and not to.node.startswith(",amp,"):
-
+__logger.
-            return self.message(stanza)
-        if to.resource:
-
+__logger.
-            return 0
-        fr=stanza.get_from()

trunk/jjigw/ircsession.py

@@ -25 +25 @@
-import string
-import random
+import logging
-
-from pyxmpp import Message,Presence,JID
@@ -39 +40 @@
-    commands_dont_show=[]
-    def __init__(self,component,config,netjid,jid,nick):
+        self.__logger=logging.getLogger("jjigw.IRCSession")
-        self.component=component
-        self.config=config
@@ -161 +163 @@
-        except:
-            clean_exit=0
-print_exception(
+__logger.exception("Exception cought:"
-        self.lock.acquire()
-        try:
@@ -190 +192 @@
-
-    def thread_loop(self):
-
+__logger.
-        while not self.exit and not self.component.shutdown:
-            self.lock.acquire()
@@ -198 +200 @@
-                sock=self.socket
-                if sock is None:
-
+__logger.
-                    continue
-                self.lock.release()
@@ -241 +243 @@
-    def _try_connect(self):
-        if not self.servers_left:
-
+__logger.
-            self.exit="No servers left, quitting"
-            return
@@ -251 +253 @@
-            self.socket=None
-        server=self.servers_left.pop(0)
-
+__logger.
-        if self.raw_channel:
-            self.pass_message_to_raw_channel("Connecting to %s:%s..." % (server.host,server.port))
@@ -258 +260 @@
-            self.socket.connect((server.host,server.port))
-        except (IOError,OSError,socket.error),err:
-
+__logger.
-            if self.raw_channel:
-                self.pass_message_to_raw_channel("Connect error: %r" % (err,))
@@ -283 +285 @@
-    def _send(self,str):
-        if self.socket and not self.exited:
-
+__logger.
-            self.socket.send(str+"\r\n")
-            if self.raw_channel:
-                self.pass_output_to_raw_channel(str)
-        else:
-
+__logger.
-
-    def send(self,str):
@@ -301 +303 @@
-            self._process_input(input)
-        except:
-print_exception(
+__logger.exception("Exception cought:"
-
-    def _process_input(self,input):
-
+__logger.
-        split=input.split(" ")
-        if split[0].startswith(":"):
@@ -363 +365 @@
-    def irc_message(self,prefix,command,params):
-        if len(params)<2 or not prefix:
-
+__logger.
-            return
-        user=self.get_user(prefix)
-        if not user:
-
+__logger.
-            return
-        if user.current_thread:
@@ -408 +410 @@
-        self.lock.acquire()
-        try:
-
+__logger.
-            self.ready=1
-            for s in self.login_requests:
@@ -472 +474 @@
-
-    def irc_cmd_352(self,prefix,command,params): # RPL_WHOREPLY
-
+__logger.
-        if len(params)<7:
-
+__logger.
-            return
-        user=self.get_user(params[4])
-        if not user:
-
+__logger.
-        else:
-            user.whoreply(params)
@@ -598 +600 @@
-        to=stanza.get_to()
-        if to not in self.used_for:
-
+__logger.
-            return 0
-        try:
@@ -638 +640 @@
-            channel_name=node_to_channel(channel_name,self.default_encoding)
-        except ValueError:
-
+__logger.
-            return None
-        if not channel_re.match(channel_name):
-
+__logger.
-            return None
-        return self.channels.get(normalize(channel_name))
@@ -716 +718 @@
-        self.exited=1
-
-    def debug(self,msg):
-        self.component.debug(msg)
-
-    def print_exception(self):
-        self.component.print_exception()
-
-# vi: sts=4 et sw=4

trunk/jjigw/ircuser.py

@@ -18 +18 @@
-#  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
+import logging
-
-from pyxmpp import JID
@@ -25 +26 @@
-class IRCUser:
-    def __init__(self,session,nick,user="",host=""):
+        self.__logger=logging.getLogger("jjigw.IRCUser")
-        self.sync_delay=0
-        self.session=session
@@ -51 +53 @@
-            return
-        elif self.sync_delay<0:
-
+__logger.
-        return channel.sync_user(self,status=status)
-
@@ -83 +85 @@
-            channel=self.session.channels.get(normalize(channel))
-            if not channel:
-
+__logger.
-                return
-        else:
@@ -121 +123 @@
-        return "<IRCUser %r: %r>" % (id(self),self.nick)
-
-    def debug(self,msg):
-        return self.session.debug(msg)
-
-# vi: sts=4 et sw=4

trunk/jjigw/spidentd.py

@@ -21 +21 @@
-import threading
-import socket
+import logging
-
-class SPIdentD:
-    def __init__(self,component,config):
+        self.__logger=logging.getLogger("jjigw.SPIdentD")
-        self.socket_path=config.socket
-        self.component=component
@@ -40 +42 @@
-                    self.loop()
-                except socket.error:
-print_exception(
+__logger.exception("Exception cought:"
-                    pass
-            finally:
@@ -82 +84 @@
-        self.queue.put(("remove",conninfo))
-
-    def debug(self,msg):
-        self.component.debug(msg)
-
-    def print_exception(self):
-        self.component.print_exception()
-
-# vi: sts=4 et sw=4