(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."
(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
(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