[bknr-cvs] ksprotte changed trunk/projects/bos/

[BKNR Commits]

Revision: 3490
Author: ksprotte
URL: http://bknr.net/trac/changeset/3490

dont start-contract-tree-image-update-daemon make-contract-tree-from-m2
U   trunk/projects/bos/build.lisp
U   trunk/projects/bos/test/fixtures.lisp
U   trunk/projects/bos/web/contract-tree.lisp

Modified: trunk/projects/bos/build.lisp
===================================================================
--- trunk/projects/bos/build.lisp	2008-07-17 13:59:38 UTC (rev 3489)
+++ trunk/projects/bos/build.lisp	2008-07-17 14:11:47 UTC (rev 3490)
@@ -69,7 +69,8 @@
                                          (swank:create-server :port ~D :dont-close t))" swank-port)))
   ;; start the bos server  
   (apply #'bos.m2::reinit (read-configuration "m2.rc"))
-  (apply #'bos.web::init (read-configuration "web.rc"))  
+  (apply #'bos.web::init (read-configuration "web.rc"))
+  (bos.web::start-contract-tree-image-update-daemon)
   (bknr.cron::start-cron))
 
 (defun start-cert-daemon ()

Modified: trunk/projects/bos/test/fixtures.lisp
===================================================================
--- trunk/projects/bos/test/fixtures.lisp	2008-07-17 13:59:38 UTC (rev 3489)
+++ trunk/projects/bos/test/fixtures.lisp	2008-07-17 14:11:47 UTC (rev 3490)
@@ -5,9 +5,8 @@
   (when snapshot
     (format t "~&;; ++ taking snapshot~%")
     (snapshot))
-  (let ((bos.web::*start-contract-tree-image-update-daemon* nil))
-    (bos.m2::reinit :directory (bknr.datastore::store-directory *store*)
-                    :website-url bos.m2::*website-url*))
+  (bos.m2::reinit :directory (bknr.datastore::store-directory *store*)
+                  :website-url bos.m2::*website-url*)
   (format t "~&;; ++ reopen-store done~%"))
 
 (defmacro reopen-store ((&key snapshot) &rest store-object-vars)
@@ -51,7 +50,7 @@
   (let ((store-path (parse-namestring
                      (format nil "/tmp/test-store-~D.tmp/" (get-universal-time)))))
     (unwind-protect
-         (let ((bos.web::*start-contract-tree-image-update-daemon* nil))
+         (progn
            (bos.m2::reinit :delete t
                            :directory store-path
                            :website-url bos.m2::*website-url*)

Modified: trunk/projects/bos/web/contract-tree.lisp
===================================================================
--- trunk/projects/bos/web/contract-tree.lisp	2008-07-17 13:59:38 UTC (rev 3489)
+++ trunk/projects/bos/web/contract-tree.lisp	2008-07-17 14:11:47 UTC (rev 3490)
@@ -306,7 +306,6 @@
 ;; contract-tree image update daemon
 (defvar *contract-tree-image-update-daemon* nil)
 (defvar *contract-tree-image-update-daemon-halt*)
-(defvar *start-contract-tree-image-update-daemon* t)
 
 (defun contract-tree-image-update-daemon-loop ()
   (loop (when *contract-tree-image-update-daemon-halt* (return))
@@ -346,9 +345,7 @@
   (dolist (contract (class-instances 'contract))
     (when (contract-published-p contract)
       (insert-contract *contract-tree* contract)))
-  (format t "~&rendering contract-tree images if needed...") (force-output)
-  (when *start-contract-tree-image-update-daemon*
-    (start-contract-tree-image-update-daemon))
+  (format t "~&rendering contract-tree images if needed...") (force-output)  
   (format t "done.~%") (force-output)  
   (geometry:register-rect-subscriber geometry:*rect-publisher* *contract-tree*
                                      (list 0 0 +width+ +width+)