@@ -15,25 +15,28 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-(require-extension (srfi 18) extras tcp s11n)
-
-(use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
-(import (prefix sqlite3 sqlite3:))
 
 (declare (unit portlogger))
 (declare (uses debugprint))
-(declare (uses db))
+(declare (uses dbmod))
+
+(module portlogger
+*
 
-(import debugprint)
+(import scheme chicken data-structures)
+(import srfi-1 posix srfi-69 hostinfo dot-locking z3
+	(srfi 18) extras tcp s11n)
+(import (prefix sqlite3 sqlite3:))
+(import debugprint dbmod)
 ;; lsof -i
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
-	 (exists   (common:file-exists? fname))
+	 (exists   (file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
 			 (sqlite3:open-database fname))))
@@ -46,12 +49,11 @@
          ;;                 port INTEGER PRIMARY KEY,
          ;;                 state TEXT DEFAULT 'not-used',
          ;;                 fail_count INTEGER DEFAULT 0,
          ;;                 update_time TIMESTAMP DEFAULT (strftime('%s','now')) );"))))
     (sqlite3:set-busy-handler! db handler)
-    (db:set-sync db) ;; (sqlite3:execute db "PRAGMA synchronous = 0;")
-    ;; (if (not exists) ;; needed with IF NOT EXISTS?
+    (sqlite3:execute db "PRAGMA synchronous = 0;")
     (sqlite3:execute 
      db
      "CREATE TABLE IF NOT EXISTS ports (
             port INTEGER PRIMARY KEY,
             state TEXT DEFAULT 'not-used',
@@ -67,11 +69,11 @@
      (begin
        ;; (release-dot-lock fname)
        (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
        ;; (debug:print 5 *default-log-port* "exn=" (condition->list exn))
-       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
+       (if (file-exists? fname)(delete-file fname)) ;; brutally get rid of it
        (print-call-chain (current-error-port)))
      (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
 	    (db     (portlogger:open-db fname))
 	    (res    (apply proc db params)))
        (sqlite3:finalize! db)
@@ -124,17 +126,12 @@
        (or curr var curr))
      #f
      db
      "SELECT (port) FROM ports WHERE state='released' LIMIT 1;")))
 
-(define (portlogger:find-port db)
-  (let* ((lowport (let ((val (configf:lookup *configdat* "server" "lowport")))
-		    (if (and val 
-			     (string->number val))
-			(string->number val)
-			32768)))
-	 (portnum (or (portlogger:get-prev-used-port db)
+(define (portlogger:find-port db #!optional (lowport 32768))
+  (let* ((portnum (or (portlogger:get-prev-used-port db)
 		      (+ lowport ;; top of registered ports is 49152 but lets use ports in the registered range
 			 (random (- 64000 lowport))))))
     (handle-exceptions
      exn
      (begin
@@ -186,5 +183,6 @@
 	     ((failed)(portlogger:set-failed db (string->number (cadr args))) 'failed)))))
     (sqlite3:finalize! db)
     result))
      
 ;; (print (apply portlogger:main (cdr (argv))))
+)