Handle connection refused and closed

diff --git a/empire.lisp b/empire.lisp
index 5d1b950b5cfa6a81fb24066239f3de0438f7bb72..7ef68bfc3506f1e4f9fe3a487b0e376b79d6df95 100644 (file)
--- a/empire.lisp
+++ b/empire.lisp
@@ -125,6 +125,7 @@ this stream.")
 
 (defgeneric handle-data (base-mode message))
 (defgeneric handle-init (base-mode message))
 
 (defgeneric handle-data (base-mode message))
 (defgeneric handle-init (base-mode message))

+(defgeneric handle-exit (base-mode message))

 (defgeneric handle-prompt (base-mode message))
 
 (defmethod handle-init ((m init-mode) message)
 (defgeneric handle-prompt (base-mode message))
 
 (defmethod handle-init ((m init-mode) message)


@@ -136,6 +137,10 @@ this stream.")
          (setf play-sent-p t))
        (set-new-mode m 'play-mode))))
 
          (setf play-sent-p t))
        (set-new-mode m 'play-mode))))
 

+(defmethod handle-exit ((m play-mode) message)
+  (declare (ignorable message))
+  (quit (connection m)))
+

 (defmethod handle-data ((m play-mode) message)
   (let* ((c (connection m))
         (log (logging-stream c)))
 (defmethod handle-data ((m play-mode) message)
   (let* ((c (connection m))
         (log (logging-stream c)))


@@ -154,6 +159,7 @@ this stream.")
 (defparameter *line-type-dispatch*
   (list `(,+C_DATA+ . handle-data)
        `(,+C_INIT+ . handle-init)
 (defparameter *line-type-dispatch*
   (list `(,+C_DATA+ . handle-data)
        `(,+C_INIT+ . handle-init)

+       `(,+C_EXIT+ . handle-exit)

        `(,+C_PROMPT+ . handle-prompt)))
 
 (defun parse-server-line (line)
        `(,+C_PROMPT+ . handle-prompt)))
 
 (defun parse-server-line (line)


@@ -180,17 +186,19 @@ this stream.")
               (format stream "No handler for ~a in mode ~a."
                       type mode)))))
 (defmethod read-message ((c connection))
               (format stream "No handler for ~a in mode ~a."
                       type mode)))))
 (defmethod read-message ((c connection))

-  (let* ((s (network-stream c))
-        (log (logging-stream c))
-        (line (read-line s)))
-    (format log "< ~a~%" line)
-    (multiple-value-bind (message type) (parse-server-line line)
-      (let ((handler (lookup-handler type))
-           (mode (connection-mode c)))
-       (if handler
-           (funcall handler mode message)
-           (error 'no-handler :mode mode :type type))))
-    line))
+  (handler-case
+      (let* ((s (network-stream c))
+            (log (logging-stream c))
+            (line (read-line s)))
+       (format log "< ~a~%" line)
+       (multiple-value-bind (message type) (parse-server-line line)
+         (let ((handler (lookup-handler type))
+               (mode (connection-mode c)))
+           (if handler
+               (funcall handler mode message)
+               (error 'no-handler :mode mode :type type))))
+       line)
+    (sb-int:closed-stream-error () nil)))

   
 (defmethod send-message ((c connection) message)
   (let ((s (network-stream c))
   
 (defmethod send-message ((c connection) message)
   (let ((s (network-stream c))

diff --git a/web.lisp b/web.lisp
index 0f6a0c8966fed615898f2b3baa4a289d7233f063..5c186c95f549f3cf0bf5d69409f7ff5d7d6853e6 100644 (file)
--- a/web.lisp
+++ b/web.lisp
@@ -55,10 +55,13 @@
 
 ;; destination of login-form
 (defun login-action ()
 
 ;; destination of login-form
 (defun login-action ()

-  (let ((connection (empire:connect :user (post-parameter "username")
-                                   :password (post-parameter "password"))))
-    (setf (session-value 'connection) connection)
-    (redirect +root-url+)))
+  (handler-case
+      (let ((connection (empire:connect :user (post-parameter "username")
+                                       :password (post-parameter "password"))))
+       (setf (session-value 'connection) connection)
+       (redirect +root-url+))
+    (usocket:connection-refused-error (e)
+      (format nil "Connection error: ~a~%" e))))

 
 (defun command-action ()
   (let ((connection (session-value 'connection)))
 
 (defun command-action ()
   (let ((connection (session-value 'connection)))