Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -142,11 +142,11 @@ (set! server-info *server-info*) (mutex-unlock! *heartbeat-mutex*) ;; The logic here is that if the server loop gets stuck blocked in working ;; we don't want to update our heartbeat (set! pulse (- (current-seconds) server-loop-heartbeat)) - (debug:print-info 1 "Heartbeat period is " pulse " on " (cadr server-info) ":" (caddr server-info)) + (debug:print-info 1 "Heartbeat period is " pulse " seconds on " (cadr server-info) ":" (caddr server-info) ", last db access is " *last-db-access*) (if (> pulse 11) ;; must stay less than 10 seconds (begin (debug:print 0 "ERROR: Heartbeat failed, committing servercide") (exit)) (open-run-close tasks:server-update-heartbeat tasks:open-db (car server-info))) Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -61,11 +61,11 @@ cleanprep : ../*.scm Makefile */*.config mkdir -p /tmp/mt_runs /tmp/mt_links cd ..;make install - rm -f */logging.db */monitor.db + rm -f */logging.db touch cleanprep fullprep : cleanprep cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/% cd fullrun;$(BINPATH)/dboard -rows 15 &