(in-package #:modlisp)
(defun modlisp-start (&key (port +default-modlisp-port+)
- (processor 'demo-modlisp-command-processor)
- (processor-args nil)
- (catch-errors t)
- timeout
- number-fixed-workers
- remote-host-checker)
+ (processor 'demo-modlisp-command-processor)
+ (processor-args nil)
+ (catch-errors t)
+ timeout
+ number-fixed-workers
+ remote-host-checker)
(let* ((server (make-instance 'ml-server
- :processor processor
- :processor-args processor-args
- :port port))
- (listener (make-instance 'listener :port port
- :base-name "modlisp"
- :function 'modlisp-command-issuer
- :function-args (list server)
- :format :text
- :wait nil
- :catch-errors catch-errors
- :timeout timeout
- :number-fixed-workers number-fixed-workers
- :remote-host-checker remote-host-checker)))
+ :processor processor
+ :processor-args processor-args
+ :port port))
+ (listener (make-instance 'listener :port port
+ :base-name "modlisp"
+ :function 'modlisp-command-issuer
+ :function-args (list server)
+ :format :text
+ :wait nil
+ :catch-errors catch-errors
+ :timeout timeout
+ :number-fixed-workers number-fixed-workers
+ :remote-host-checker remote-host-checker)))
(setf (listener server) listener)
(init/listener listener :start)
(setf *ml-server* server)
"generates commands from modlisp, issues commands to processor-fun"
(unwind-protect
(progn
- (let ((*number-worker-requests* 0)
- (*close-modlisp-socket* t)
- (*ml-server* server))
- (do ((command (read-modlisp-command) (read-modlisp-command)))
- ((null command))
- (apply (processor server) command (processor-args server))
- (finish-output *modlisp-socket*)
- (incf *number-worker-requests*)
- (incf *number-server-requests*)
- (when *close-modlisp-socket*
- (return)))))
+ (let ((*number-worker-requests* 0)
+ (*close-modlisp-socket* t)
+ (*ml-server* server))
+ (do ((command (read-modlisp-command) (read-modlisp-command)))
+ ((null command))
+ (apply (processor server) command (processor-args server))
+ (finish-output *modlisp-socket*)
+ (incf *number-worker-requests*)
+ (incf *number-server-requests*)
+ (when *close-modlisp-socket*
+ (return)))))
(close-active-socket *modlisp-socket*)))
-
+
(defun header-value (header key)
"Returns the value of a modlisp header"
(cdr (assoc key header :test #'eq)))
(defun read-modlisp-command ()
(ignore-errors
(let* ((header (read-modlisp-header))
- (content-length (header-value header :content-length))
- (content (when content-length
- (make-string
- (parse-integer content-length :junk-allowed t)))))
- (when content
- (read-sequence content *modlisp-socket*)
- (push (cons :posted-content content) header))
- header)))
+ (content-length (header-value header :content-length))
+ (content (when content-length
+ (make-string
+ (parse-integer content-length :junk-allowed t)))))
+ (when content
+ (read-sequence content *modlisp-socket*)
+ (push (cons :posted-content content) header))
+ header)))
(defun read-modlisp-line ()
(kmrcl:string-right-trim-one-char
#\return
- (read-line *modlisp-socket* nil nil)))
+ (read-line *modlisp-socket* nil nil)))
(defun read-modlisp-header ()