add suppport for lispworks. Use default irc port if port not specified

diff --git a/debian/changelog b/debian/changelog
index 5679164dbf1036be22f060f8061fa89e9c435e2f..df19c273126bd0af8e6f8814eca69bee8d9d295d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-irc-logger (0.9.4-1) unstable; urgency=low
+
+  * Use default IRC port number is port keyword is not supplied 
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 14 Nov 2007 15:09:08 -0700
+
 cl-irc-logger (0.9.3-1) unstable; urgency=low
 
   * Support non-standard IRC port numbers

diff --git a/logger.lisp b/logger.lisp
index 8910479a4d0f374a82a2cebabfb82ee0554ac09e..a50e1be82eade7c0bd299011ee56349687270dd6 100644 (file)
--- a/logger.lisp
+++ b/logger.lisp
@@ -7,7 +7,7 @@
 (in-package #:irc-logger)
 
 (defvar *daemon-monitor-process* nil "Process of background monitor.")
-(defparameter *timeout* 60)
+(defparameter *timeout* 120)
 
 (defclass log-channel ()
   ((name :initarg :name :reader c-name
@@ -508,6 +508,7 @@
   (and (pathnamep user-output) (null (pathname-name user-output))))
 
 (defun do-connect-and-join (nick server port username realname logging-stream channels)
+  (unless port (setq port 6667))
   (let ((conn (connect :nickname nick :server server :port port
                        :username username :realname realname
                        :logging-stream logging-stream)))
@@ -535,8 +536,8 @@
     (add-hook conn 'irc::irc-rpl_topicwhotime-message 'rpl_topicwhotime-hook)
     conn))
 
-(defmethod cl-irc::irc-message-event :around ((msg cl-irc::irc-message))
-  (let ((result (call-next-method msg)))
+(defmethod cl-irc::irc-message-event :around (connection (msg cl-irc::irc-message))
+  (let ((result (call-next-method connection msg)))
     (typecase msg
       ((or irc::irc-privmsg-message irc::ctcp-action-message irc::irc-nick-message
         irc::irc-part-message irc::irc-quit-message irc::irc-join-message
@@ -552,12 +553,12 @@
        )
       (t
        (add-log-entry
-        (get-unknown-log-stream (find-logger-with-connection (connection msg)))
+        (get-unknown-log-stream (find-logger-with-connection connection))
         "~A"
         (raw-message-string msg))))
     result))
 
-(defun create-logger (nick server &key port channels output password
+(defun create-logger (nick server &key (port 6667) channels output password
                       realname username async
                       private-log unknown-log
                       (logging-stream t) (formats '(:text)))
@@ -637,7 +638,7 @@
              (delete nick *loggers*  :test #'string-equal :key #'l-nickname))
        t))))
 
-(defun add-logger (nick server &key port channels output (password "")
+(defun add-logger (nick server &key (port 6667) channels output (password "")
                                     realname username private-log unknown-log
                                     (logging-stream t) (async t)
                                     (formats '(:sexp)))
@@ -648,8 +649,9 @@
   (add-private-log-entry nil "Calling create-logger [add-logger].~%")
   (let ((logger
          (do ((new-logger
-               (#-sbcl mp:with-timeout #-sbcl (*timeout* nil)
-                #+sbcl sb-ext:with-timeout #+sbcl *timeout*
+               (#+allegro mp:with-timeout #+allegro (*timeout* nil)
+                          #+sbcl sb-ext:with-timeout #+sbcl *timeout*
+                          #+lispworks progn
                  (create-logger nick server :port port :channels channels :output output
                                 :logging-stream logging-stream :password password
                                 :realname realname :username username
@@ -657,8 +659,9 @@
                                 :unknown-log unknown-log
                                 :formats formats
                                 :async async))
-               (#-sbcl mp:with-timeout #-sbcl (*timeout* nil)
-                #+sbcl sb-ext:with-timeout #+sbcl *timeout*
+               (#+allegro mp:with-timeout #+allegro (*timeout* nil)
+                          #+sbcl sb-ext:with-timeout #+sbcl *timeout*
+                          #+lispworks progn
                  (create-logger nick server :port port :channels channels :output output
                                 :logging-stream logging-stream :password password
                                 :realname realname :username username
@@ -666,6 +669,7 @@
                                 :unknown-log unknown-log
                                 :formats formats
                                 :async async))))
+
              (new-logger
               (progn
                 (add-private-log-entry nil "Acquired new logger ~A." new-logger)