r8548: fix bug with unknown/private stream of nil

diff --git a/debian/changelog b/debian/changelog
index c1c5bde52615b5912f69824310df0da37949411a..39f4c288573efcaa450725cf77c46e6697f5d423 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-irc-logger (0.7.3-1) unstable; urgency=low
+
+  * Fix bug with unknown/private streams
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 19 Jan 2004 20:59:32 -0700
+
 cl-irc-logger (0.7.2-1) unstable; urgency=low
 
   * New upstream

diff --git a/logger.lisp b/logger.lisp
index d35708b6c540e3783c9ffabd35011a7fb190833f..16a47aff2e5336703a96456c2aba9f48803629ce 100644 (file)
--- a/logger.lisp
+++ b/logger.lisp
@@ -268,12 +268,11 @@
 
 (defmethod %output-event ((format (eql :sexp)) stream utime type channel source text
                          msg unichannel)
-  (let ((*print-circle* nil)
-       (*print-pretty* nil))
+  (with-standard-io-syntax
     (if unichannel
        (format stream "(~S ~S ~S ~S ~S)~%" utime type source text (last-sexp-field type msg))
-      (format stream "(~S ~S ~S ~S ~S ~S)~%" utime type source channel text
-             (last-sexp-field type msg)))))
+       (format stream "(~S ~S ~S ~S ~S ~S)~%" utime type source channel text
+               (last-sexp-field type msg)))))
 
 (defmethod %output-event ((format (eql :text)) stream utime type channel
                          source text msg unichannel)
@@ -367,10 +366,14 @@
             (output-event-for-a-stream msg type channel text logger i))))))))
 
 (defun get-private-log-stream (logger)
-  (or (private-log-stream logger) *standard-output*))
+  (if (and logger (private-log-stream logger))
+      (private-log-stream logger)
+    *standard-output*))
 
 (defun get-unknown-log-stream (logger)
-  (or (unknown-log-stream logger) *standard-output*))
+  (if (and logger (unknown-log-stream logger))
+      (unknown-log-stream logger)
+    *standard-output*))
 
 (defun privmsg-hook (msg)
   (let ((logger (find-logger-with-connection (connection msg)))