Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -149,23 +149,24 @@ ;; if none running or if > 20 seconds since ;; server last used then start shutdown (let loop ((count 0)) (thread-sleep! 20) ;; no need to do this very often (let ((numrunning (db:get-count-tests-running db))) - (if (or (not (> numrunning 0)) - (> *last-db-access* (+ (current-seconds) 60))) + (if (or (> numrunning 0) + (> (+ *last-db-access* 60)(current-seconds))) + (begin + (debug:print 0 "INFO: Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *last-db-access*)) + (loop (+ 1 count))) (begin (debug:print 0 "INFO: Starting to shutdown the server side") ;; need to delete only *my* server entry (future use) (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' AND val like ?;" host:port) (thread-sleep! 10) (debug:print 0 "INFO: Max cached queries was " *max-cache-size*) (debug:print 0 "INFO: Server shutdown complete. Exiting") - (exit)) - (debug:print 0 "INFO: Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *last-db-access*)) - )) - (loop (+ 1 count)))) + ;; (exit))) + ))))) (define (server:find-free-port-and-open port) (handle-exceptions exn (begin @@ -199,12 +200,12 @@ ;; #f) (set! *runremote* #f)) (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server ((rpc:procedure 'server:login host portn) *toppath*)) (begin - (debug:print 2 "INFO: Connected to " host ":" port) + (debug:print 2 "INFO: Logged in and connected to " host ":" port) (set! *runremote* (vector host portn))) (begin - (debug:print 2 "INFO: Failed to connect to " host ":" port) + (debug:print 2 "INFO: Failed to login or connect to " host ":" port) (set! *runremote* #f))))) (debug:print 2 "INFO: no server available"))))) Index: utils/installall.sh ================================================================== --- utils/installall.sh +++ utils/installall.sh @@ -90,10 +90,12 @@ for a in `ls */*.meta|cut -f1 -d/` ; do echo $a (cd $a;chicken-install) done +export LIBPATH=$PREFIX/lib$ADDITIONAL_LIBPATH +export LD_LIBRARY_PATH=$LIBPATH export SQLITE3_VERSION=3071401 echo Install sqlite3 if ! [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then wget http://www.sqlite.org/sqlite-autoconf-$SQLITE3_VERSION.tar.gz