X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=logger.lisp;h=9a4b8f1b7bb3d82690a7bbe8c9a4d1330694e587;hb=6c1474d89e0dd6f5bf561fb70aaf0ba0929e6176;hp=c686d4197aac13213bc99af7b8c16b6a3c463615;hpb=b0ecee99c1d09a77daa830e17c96fb908c5cb962;p=irc-logger.git

diff --git a/logger.lisp b/logger.lisp
index c686d41..9a4b8f1 100644
--- a/logger.lisp
+++ b/logger.lisp
@@ -7,6 +7,7 @@
 (in-package #:irc-logger)
 
 (defvar *daemon-monitor-process* nil "Process of background monitor.")
+(defparameter *timeout* 60)
 
 (defclass channel ()
   ((name :initarg :name :reader c-name
@@ -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*
@@ -85,7 +90,7 @@
   (string-left-trim '(#\#) name))
 
 (defun find-channel-with-name (logger name)
-  (find name (the list (channels logger)) :test #'string-equal :key #'name))
+  (find name (the list (channels logger)) :test #'string-equal :key #'c-name))
   
 (defun make-output-name (name year month day)
     (format nil "~A-~4,'0D.~2,'0D.~2,'0D" (canonicalize-channel-name name)
@@ -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)))
@@ -410,9 +422,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))))
 
@@ -626,13 +638,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))
@@ -659,7 +689,7 @@
 	   (setf (get-stream channel i) nil)))
        (setf (channels logger) (delete channel-name (channels logger)
 				       :test #'string-equal
-				       :key #'name))
+				       :key #'c-name))
        (setf (channel-names logger) (delete channel-name (channel-names logger)
 					    :test #'string-equal))
        t)
@@ -718,7 +748,6 @@
 (defun is-connected (logger)
   (%is-connected logger))
 
-(defparameter *timeout* 60)
 
 (defun is-connected (logger)
   #-allegro (%is-connected logger)
@@ -785,8 +814,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."