X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=logger.lisp;h=065effa485c76bd7be8931ae2f7fa2b2bb336d36;hb=097d28989cb7d3e3c824212e1ddeeb8d6a2a3f39;hp=3c7ff2dae32158d18d14c05303312d5b864772f3;hpb=3a0664a78d4388d5bc17e120a296d5c2a159d265;p=irc-logger.git

diff --git a/logger.lisp b/logger.lisp
index 3c7ff2d..065effa 100644
--- 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
@@ -67,6 +67,10 @@
 		  :documentation
 		  "Time of last, potentially active, warning message.")))
 
+(defmethod print-object ((obj logger) stream)
+  (print-unreadable-object (obj stream :type t :identity t)
+    (format stream "~A" (l-nickname obj))))
+
 (defvar *loggers* nil "List of active loggers.")
 
 (defparameter *user-address-scanner*
@@ -142,6 +146,9 @@
 (defmethod log-file-path (output-root channel-name year month day (format (eql :sexp)))
   (%log-file-path output-root channel-name year month day "sexp"))
 
+(defmethod log-file-path (output-root channel-name year month day (format (eql :binary)))
+  (%log-file-path output-root channel-name year month day "bin"))
+
 (defmethod log-file-path (output-root channel-name year month day (format (eql :text)))
   (%log-file-path output-root channel-name year month day "txt"))
 
@@ -389,9 +396,13 @@
       (output-event msg :privmsg channel (trailing-argument msg))))))
 
 (defun action-hook (msg)
-  (output-event msg :action (first (arguments msg))
-		(subseq (trailing-argument msg)	8 
-			(- (length (trailing-argument msg)) 1))))
+  (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))
+    (output-event msg :action (first (arguments msg))
+		  (subseq (trailing-argument msg) (min 8 end)
+			  (- (length (trailing-argument msg)) 1)))))
 
 (defun nick-hook (msg)
   (output-event msg :nick nil (trailing-argument msg)))
@@ -415,9 +426,9 @@
        logger
        "Logging daemon ~A has been kicked from ~A (~A)"
        (l-nickname logger) channel (trailing-argument msg))
-      (daemon-sleep 1)
+      (daemon-sleep 5)
       (remove-channel-logger logger channel)
-      (daemon-sleep 1)
+      (daemon-sleep 10)
       (add-channel-logger logger channel)
       (add-private-log-entry logger "Rejoined ~A" channel))))
 
@@ -477,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)
@@ -711,7 +722,8 @@
   (let ((text (trailing-argument msg))
 	(logger (find-logger-with-connection (connection msg))))
     (when (and (stringp text) 
-	       (zerop (search (format nil "Closing Link: ~A" (l-nickname logger)) text)))
+	       (eql 0 (search (format nil "Closing Link: ~A"
+				      (l-nickname logger)) text)))
       (setf (warning-message-utime logger) (received-time msg)))
     (output-event msg :error nil (trailing-argument msg))))