r10646: updates

[irc-logger.git] / logger.lisp

diff --git a/logger.lisp b/logger.lisp
index 7988c55a78fabd84f3ffb5a85a885d2fc5e51861..b242f5a9f806480cc3e06a1e3f67aa8083ea3c31 100644 (file)
--- a/logger.lisp
+++ b/logger.lisp
@@ -9,7 +9,7 @@
 (defvar *daemon-monitor-process* nil "Process of background monitor.")
 (defparameter *timeout* 60)
 
-(defclass channel ()
+(defclass log-channel ()
   ((name :initarg :name :reader c-name
         :documentation "Name of channel.")
    (streams :initarg :streams :reader streams
@@ -399,7 +399,7 @@
   (let ((end (- (length (trailing-argument msg)) 1)))
     ;; end has been as low as 7
     (when (< end 8)
-      (warn "End is less than 8: `$A'." msg))
+      (warn "End is less than 8: `~A'." msg))
     (output-event msg :action (first (arguments msg))
                  (subseq (trailing-argument msg) (min 8 end)
                          (- (length (trailing-argument msg)) 1)))))
@@ -488,7 +488,7 @@
 
 
 (defun make-a-channel (name formats output)
-  (make-instance 'channel
+  (make-instance 'log-channel
                 :name name
                 :streams (make-array (length formats) :initial-element nil)
                 :output-root (when (and (pathnamep output)
@@ -645,7 +645,8 @@
   (add-private-log-entry nil "Calling create-logger [add-logger].~%")
   (let ((logger
         (do ((new-logger 
-              (mp:with-timeout (*timeout* nil)
+              (#-sbcl mp:with-timeout #-sbcl (*timeout* nil)
+               #+sbcl sb-ext:with-timeout #+sbcl *timeout*
                 (create-logger nick server :channels channels :output output
                                :logging-stream logging-stream :password password
                                :realname realname :username username
@@ -653,7 +654,8 @@
                                :unknown-log unknown-log 
                                :formats formats
                                :async async))
-              (mp:with-timeout (*timeout* nil)
+              (#-sbcl mp:with-timeout #-sbcl (*timeout* nil)
+               #+sbcl sb-ext:with-timeout #+sbcl *timeout*
                 (create-logger nick server :channels channels :output output
                                :logging-stream logging-stream :password password
                                :realname realname :username username