fix reconnect

[eow] / empire.lisp

diff --git a/empire.lisp b/empire.lisp
index 14ee352df7d5b295363e310342e580b0d902199c..8ce62fb2fb88d38e21f91b1326d9d4a160ddb206 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -44,7 +44,11 @@
    (session
     :accessor session
     :initarg :session
-    :documentation "web session to which this connection belongs")))
+    :documentation "web session to which this connection belongs")
+   (send-queue
+    :accessor send-queue
+    :initform (locked-queue:create)
+    :documentation "lines outstanding to be sent at next prompt")))
 
 (defun make-connection (&key (user nil)
                        (password nil)
@@ -88,8 +92,12 @@
 (defgeneric handle-connection (connection))
 (defgeneric read-message (connection))
 (defgeneric send-message (connection message))
+(defgeneric connected-p (connection))
 (defgeneric reconnect (conncetion))
 
+(defmethod connected-p ((c connection))
+  (sb-thread:thread-alive-p (connection-handler c)))
+
 (defmethod reconnect ((c connection))
   (with-slots (server-name server-port user password socket stream connection-handler) c
       (let* ((sock (usocket:socket-connect server-name server-port))
@@ -170,13 +178,17 @@
   (let* ((c (connection m)))
     (empire-web:prompt (session c) message)))
 
+(defmethod send-next-line ((c connection))
+  (send-message-one c (locked-queue:dequeue (send-queue c))))
+
 (defmethod handle-prompt ((m play-mode) message)
   (let* ((c (connection m)))
     (with-input-from-string (s message)
       (let* ((minutes (read s)) ;;FIXME DANGEROUS
             (btus (read s)))
        (empire-web:prompt (session c)
-                          (format nil "[~a,~a]: " minutes btus))))))
+                          (format nil "[~a,~a]: " minutes btus))))
+    (send-next-line c)))
 
 (defmethod handle-ignore ((m init-mode) message)
   (declare (ignorable message))
@@ -244,21 +256,9 @@
     (raw-send-message s message)))
 
 (defmethod send-message ((c connection) message)
-  (let ((sent-p nil)
-       (tries 3))
-    (loop
-       while (and (not sent-p)
-                 (> tries 0))
-       do (handler-case
-             (progn
-               (send-message-one c 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)
+  (if (not (connected-p c))
+      (reconnect c))
+  (locked-queue:enqueue (send-queue c) message))
 
 (defparameter +special-command-char+ #\;)