X-Git-Url: http://git.pond.sub.org/?p=eow;a=blobdiff_plain;f=web.lisp;h=b3a8a75790918ac6ec92fd15a636532f77ddd629;hp=96aca61708bc8f95acd11d79255cc801ed9a980f;hb=58c69aa5c7a9fceb42e36c9ab8d901c7cf66f643;hpb=cb4d7092bd39cb0dc6f39c15d6fda7ec2ae311b0

diff --git a/web.lisp b/web.lisp
index 96aca61..b3a8a75 100644
--- a/web.lisp
+++ b/web.lisp
@@ -53,12 +53,18 @@
 (defgeneric prompt (session minutes btus))
 (defgeneric data (session message))
 
-(defvar *session*)
+(defvar *empire-session*)
+
+(defmacro with-session (&body body)
+  `(let ((*empire-session* (session-value 'session)))
+     (if *empire-session*
+	 (progn ,@body)
+	 (redirect +login-page+))))
 
 (defun update ()
   "Send stream of updates to client"
   (with-session
-    (locked-queue:dequeue (update-queue *session*))))
+    (locked-queue:dequeue (update-queue *empire-session*))))
 
 (defmethod send ((s session) string)
   "Push a javascript update fragment to the client."
@@ -70,12 +76,6 @@
 (defmethod data ((s session) message)
   (send s (parenscript:ps* `(msg ,message))))
 
-(defmacro with-session (&body body)
-  `(let ((*session* (session-value 'session)))
-     (if *session*
-	 (progn ,@body)
-	 (redirect +login-page+))))
-
 ;; destination of login-form
 (defun login-action ()
   (handler-case
@@ -88,7 +88,7 @@
 
 (defun command-action ()
   (with-session
-      (empire:send-message (connection *session*) (get-parameter "q"))))
+      (empire:send-message (connection *empire-session*) (get-parameter "q"))))
 
 (defun root-page ()
   (with-session