Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -10,10 +10,11 @@
 (use sqlite3 srfi-18)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit lock-queue))
 (declare (uses common))
+(declare (uses tasks))
 
 ;;======================================================================
 ;; attempt to prevent overlapping updates of rollup files by queueing
 ;; update requests in an sqlite db
 ;;======================================================================
@@ -102,12 +103,12 @@
 	    (set! res tid)))
       (lock-queue:db-dat-get-db dbdat)
       "SELECT test_id FROM queue WHERE start_time > ?;" mystart)
      res)))
 
-(define (lock-queue:get-lock dbdat test-id #!key (count 10))
-  (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200 remove: #t waiting-msg "lock-queue:get-lock, waiting on journal")
+(define (lock-queue:get-lock dbdat test-id #!key (count 10)(waiting-msg #f))
+  (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200 remove: #t waiting-msg: "lock-queue:get-lock, waiting on journal")
   (let* ((res       #f)
 	 (db        (lock-queue:db-dat-get-db dbdat))
 	 (lckqry    (sqlite3:prepare db "SELECT test_id,run_lock FROM runlocks WHERE run_lock='locked';"))
 	 (mklckqry  (sqlite3:prepare db "INSERT INTO runlocks (test_id,run_lock) VALUES (?,'locked');")))
     (let ((result 
@@ -179,19 +180,20 @@
 
 ;; returns #f if ok to skip the task
 ;; returns #t if ok to proceed with task
 ;; otherwise waits
 ;;
-(define (lock-queue:wait-turn fname test-id #!key (count 10))
+(define (lock-queue:wait-turn fname test-id #!key (count 10)(waiting-msg #f))
   (let* ((dbdat   (lock-queue:open-db fname))
 	 (mystart (current-seconds))
 	 (db      (lock-queue:db-dat-get-db dbdat)))
     (handle-exceptions
      exn
      (begin
        (debug:print 0 "WARNING: Failed to find out if it is ok to skip the wait queue. Will try again in few seconds")
        (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+       (print-call-chain)
        (thread-sleep! 10)
        (if (> count 0)
 	   (begin
 	     (sqlite3:finalize! db)
 	     (lock-queue:wait-turn fname test-id count: (- count 1)))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -48,10 +48,11 @@
      (begin
        ;; (release-dot-lock fname)
        (debug:print 0 "ERROR: portlogger:open-run-close failed. " proc " " params)
        (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
        (debug:print 0 "exn=" (condition->list exn))
+       (if (file-exists? fname)(delete-file fname)) ;; brutally get rid of it
        (print-call-chain))
      (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
 	    (db     (portlogger:open-db fname))
 	    (res    (apply proc db params)))
        (sqlite3:finalize! db)