From: Gerd Flaig <gefla@gefla-mac-zrh>
Date: Fri, 2 Jan 2009 17:26:48 +0000 (+0100)
Subject: Fix retry logic. Remove extraneous newlines in logging.
X-Git-Url: http://git.pond.sub.org/?p=eow;a=commitdiff_plain;h=5f6fe572cf671662da4c7c7e5d38207da6ced92e

Fix retry logic. Remove extraneous newlines in logging.
---

diff --git a/empire.lisp b/empire.lisp
index 1f2aae4..34aea13 100644
--- a/empire.lisp
+++ b/empire.lisp
@@ -216,7 +216,7 @@
   (handler-case
       (let* ((s (network-stream c))
 	     (line (read-line s)))
-	(empire-log:info "< ~a~%" line)
+	(empire-log:info "~a: < ~a" c line)
 	(multiple-value-bind (message type) (parse-server-line line)
 	  (let ((handler (lookup-handler type))
 		(mode (connection-mode c)))
@@ -233,23 +233,22 @@
     (force-output s))
   
 (defmethod send-message ((c connection) message)
-  (let ((s (network-stream c)))
-    (empire-log:info "> ~a~%" message)
-    (let ((sent-p nil)
-	  (tries 3))
-      (loop
-	 while (and (not sent-p)
-		    (> tries 0))
-	 do (handler-case
-		(progn
-		  (raw-send-message s message)
-		  (setf sent-p t))
-	      (sb-int:closed-stream-error ()
-		(progn
-		  (decf tries)
-		  (empire-log:info "Connection close - retrying (~a tries left)" tries)
-		  (reconnect c))))))
-    message))
+  (empire-log:info "~a: > ~a" c message)
+  (let ((sent-p nil)
+	(tries 3))
+    (loop
+       while (and (not sent-p)
+		  (> tries 0))
+       do (handler-case
+	      (let ((s (network-stream c)))
+		(raw-send-message s message)
+		(setf sent-p t))
+	    (sb-int:closed-stream-error ()
+	      (progn
+		(decf tries)
+		(empire-log:info "~a: Connection close - retrying (~a tries left)" c tries)
+		(reconnect c))))))
+  message)
 
 (defparameter +special-command-char+ #\;)