X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=logger.lisp;h=14294517eca26b1827a6f374aad079c33c88d02d;hb=0f9d06416786a978c616fbdfdfef871c29e310a6;hp=3bb165f1560f7145d07c48cada914db38b582331;hpb=d289ec60467cae9601d4eb2f1b150037bf586fb9;p=irc-logger.git

diff --git a/logger.lisp b/logger.lisp
index 3bb165f..1429451 100644
--- a/logger.lisp
+++ b/logger.lisp
@@ -4,7 +4,7 @@
 ;;;; Purpose: A IRC logging bot 
 ;;;; Author:  Kevin Rosenberg
 
-(in-package irc-logger)
+(in-package #:irc-logger)
 
 (defvar *daemon-monitor-process* nil "Process of background monitor.")
 
@@ -407,6 +407,7 @@
     (output-event msg :kick channel who-kicked)
     (when (string-equal (nickname logger) who-kicked)
       (add-private-log-entry
+       logger
        "Logging daemon ~A has been kicked from ~A (~A)"
        (nickname logger) channel (trailing-argument msg))
       (daemon-sleep 1)
@@ -534,6 +535,7 @@
       (t
        (add-log-entry
 	(get-unknown-log-stream (find-logger-with-connection (connection msg)))
+	"~A"
 	(raw-message-string msg))))
     result))
 
@@ -786,13 +788,13 @@
 (defun daemon-monitor ()
   "This function runs in the background and monitors the connection of the logger."
   ;; run forever
-  (do ()
-      ()
-    (block main-loop
-      (dolist (logger *loggers*)
-	(do ((warning-time (warning-message-utime logger) (warning-message-utime logger)))
-	    ((or (is-connected logger) (null warning-time)))
-	  (cond
+  (loop
+   do
+   (block main-loop
+     (dolist (logger *loggers*)
+       (do ((warning-time (warning-message-utime logger) (warning-message-utime logger)))
+	   ((or (is-connected logger) (null warning-time)))
+	 (cond
 	   ((and warning-time (> (- (get-universal-time) warning-time) 180))
 	    ;;give up frequent checking because no disconnection despite waiting
 	    (setf (warning-message-utime logger) nil))
@@ -805,9 +807,9 @@
 	    (return-from main-loop))
 	   (t
 	    (daemon-sleep 30)))))
-      (do ((i 0 (1+ i)))
-	  ((or (>= i 20) (some (lambda (logger) (warning-message-utime logger)) *loggers*))) 
-	(daemon-sleep 15)))))
+     (do ((i 0 (1+ i)))
+	 ((or (>= i 20) (some (lambda (logger) (warning-message-utime logger)) *loggers*))) 
+       (daemon-sleep 15)))))