r5250: *** empty log message ***

[cl-modlisp.git] / variables.lisp

diff --git a/variables.lisp b/variables.lisp
index d9f4f1ee87e53fc02e58130e9eb5e69591ca0611..f107c38bb26f2f3823febe10739147b4f162688e 100644 (file)
--- a/variables.lisp
+++ b/variables.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: variables.lisp,v 1.4 2003/07/05 22:54:00 kevin Exp $
+;;;; $Id: variables.lisp,v 1.5 2003/07/08 06:40:00 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
@@ -29,21 +29,26 @@
 (defvar *close-apache-socket* t)
 
 (defclass listener ()
-  ((process :initarg process :accessor process)
-   (socket :initarg socket :accessor socket)
+  ((port :initarg :port :accessor port) 
+   (function :initarg :function :accessor listener-function
+            :initform nil)
+   (function-args :initarg :function-args :accessor function-args
+                 :initform nil)
+   (process :initarg :process :accessor process)
+   (socket :initarg :socket :accessor socket)
    (workers :initform nil :accessor workers
-           :documentation "list of worker threads")))
+           :documentation "list of worker threads")
+   (name :initform "" :accessor name :initarg :name)
+   (wait :initform nil :accessor wait :initarg :wait)
+   (format :initform :text :accessor listener-format :initarg :format)))
 
 (defvar *active-listeners* nil
     "List of active listeners")
 
 (defclass worker ()
   ((listener :initarg :listener :accessor listener :initform nil)
+   (connection :initarg :connection :accessor connection :initform nil)
    (name :initarg :name :accessor name :initform nil)
-   (func :initarg :func :accessor func :initform nil)
-   (function-args :initarg :function-args :accessor function-args
-                 :initform nil)
-   (socket :initarg :socket :accessor socket :initform nil)
    (thread-fun :initarg :thread-fun :accessor thread-fun :initform nil)
    (process :initarg :process :accessor process :initform nil)))