r10366: change name of channel class to log-channel

[irc-logger.git] / logger.lisp

diff --git a/logger.lisp b/logger.lisp
index 86604b365b342a18771abb4233cb9b05f93e6e7c..065effa485c76bd7be8931ae2f7fa2b2bb336d36 100644 (file)
--- a/logger.lisp
+++ b/logger.lisp
@@ -7,8 +7,9 @@
 (in-package #:irc-logger)
 
 (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
@@ -66,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*
@@ -141,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"))
 
@@ -372,7 +380,11 @@
           (apply #'format nil fmt args)))))
 
 (defun add-private-log-entry (logger fmt &rest args)
-  (apply #'add-log-entry (get-private-log-stream logger) fmt args))
+  (apply #'add-log-entry
+        (if (get-private-log-stream logger) 
+            (get-private-log-stream logger) 
+            *standard-output*)
+        fmt args))
 
 (defun privmsg-hook (msg)
   (let ((logger (find-logger-with-connection (connection msg)))
@@ -384,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)))
@@ -410,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))))
 
@@ -472,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)
@@ -626,13 +642,31 @@
     (add-private-log-entry (find-logger-with-nick nick)
                           "Closing previously active connection [add-logger].")
     (ignore-errors (remove-logger nick)))
-  (let ((logger (create-logger nick server :channels channels :output output
-                              :logging-stream logging-stream :password password
-                              :realname realname :username username
-                              :private-log private-log 
-                              :unknown-log unknown-log 
-                              :formats formats
-                              :async async)))
+  (add-private-log-entry nil "Calling create-logger [add-logger].~%")
+  (let ((logger
+        (do ((new-logger 
+              (mp:with-timeout (*timeout* nil)
+                (create-logger nick server :channels channels :output output
+                               :logging-stream logging-stream :password password
+                               :realname realname :username username
+                               :private-log private-log 
+                               :unknown-log unknown-log 
+                               :formats formats
+                               :async async))
+              (mp:with-timeout (*timeout* nil)
+                (create-logger nick server :channels channels :output output
+                               :logging-stream logging-stream :password password
+                               :realname realname :username username
+                               :private-log private-log 
+                               :unknown-log unknown-log 
+                               :formats formats
+                               :async async))))
+            (new-logger 
+             (progn
+               (add-private-log-entry nil "Acquired new logger ~A." new-logger)
+               new-logger))
+          (add-private-log-entry nil "Timeout trying to create new logger [add-logger]."))))
+    (add-private-log-entry logger "Pushing newly created logger ~A [add-logger].~%" logger)
     (push logger *loggers*)
     (start-logger logger async)
     logger))
@@ -688,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))))
 
@@ -718,7 +753,6 @@
 (defun is-connected (logger)
   (%is-connected logger))
 
-(defparameter *timeout* 60)
 
 (defun is-connected (logger)
   #-allegro (%is-connected logger)
@@ -785,8 +819,7 @@
        (sleep 5)
        (when (is-connected new-logger)
          (log-reconnection new-logger)))))
-      
-  )
+  ) ;; end closure
 
 (defun daemon-monitor ()
   "This function runs in the background and monitors the connection of the logger."