From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Fri, 7 May 2004 22:19:18 +0000 (+0000)
Subject: r9281: more debugging for deamon monitor
X-Git-Tag: v0.9.3~14
X-Git-Url: http://git.kpe.io/?p=irc-logger.git;a=commitdiff_plain;h=3a0664a78d4388d5bc17e120a296d5c2a159d265

r9281: more debugging for deamon monitor
---

diff --git a/logger.lisp b/logger.lisp
index a05d19e..3c7ff2d 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
@@ -372,7 +373,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)))
@@ -626,15 +631,31 @@
     (add-private-log-entry (find-logger-with-nick nick)
 			   "Closing previously active connection [add-logger].")
     (ignore-errors (remove-logger nick)))
-  (format t "Calling create-logger [add-logger].~%")
-  (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)))
-    (format t "Pushing newly created logger ~A [add-logger].~%" logger)
+  (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))
@@ -720,7 +741,6 @@
 (defun is-connected (logger)
   (%is-connected logger))
 
-(defparameter *timeout* 60)
 
 (defun is-connected (logger)
   #-allegro (%is-connected logger)