Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -1,5 +1,7 @@
+
+
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
 ;; This file is part of Megatest.
 ;; 
@@ -377,33 +379,34 @@
 ;;
 ;; NB// Runs on the server as part of the server loop
 ;;
 (define (api:process-request dbstruct $) ;; the $ is the request vars proc
   (set! *api-process-request-count* (+ *api-process-request-count* 1))
+  (debug:print 0 *default-log-port* "server-id:"  *server-id*)
   (let* ((cmd     ($ 'cmd))
 	 (paramsj ($ 'params))
-         (key     ($ 'key)))   
-	 (params  (db:string->obj paramsj transport: 'http)) ;; incoming data from the POST (or is it a GET?)
-         (debug:print 0 *default-log-port* "cmd:" cmd " with params " params "key " key)
-         (if (equal? key *server-id**)
-           (let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
-	      (success (vector-ref resdat 0))
-	      (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
-             (debug:print 0 *default-log-port* "res:" res)
-             (if (not success)
-	        (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
-    (if (> *api-process-request-count* *max-api-process-requests*)
-	(set! *max-api-process-requests* *api-process-request-count*))
-    (set! *api-process-request-count* (- *api-process-request-count* 1))
-    ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
-    ;; (rmt:dat->json-str
-    ;;  (if (or (string? res)
-    ;;          (list?   res)
-    ;;          (number? res)
-    ;;          (boolean? res))
-    ;;      res 
-    ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
-    (db:obj->string res transport: 'http))
-    (begin
-       (debug:print 0 *default-log-port*   "Login failed server-id mismatch: " server-signature ", " *server-id*) 
-       (db:obj->string (conc "Login failed server-id mismatch: " server-signature ", " *server-id*) transport: 'http)))))
+         (key     ($ 'key))   
+	 (params  (db:string->obj paramsj transport: 'http))) ;; incoming data from the POST (or is it a GET?)
+    (debug:print 0 *default-log-port* "cmd:" cmd " with params " params "key " key)
+    (if (equal? key *server-id*)
+	(let* ((resdat  (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result )
+	       (success (vector-ref resdat 0))
+	       (res     (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?)
+	  (debug:print 0 *default-log-port* "res:" res)
+	  (if (not success)
+	      (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params))
+	  (if (> *api-process-request-count* *max-api-process-requests*)
+	      (set! *max-api-process-requests* *api-process-request-count*))
+	  (set! *api-process-request-count* (- *api-process-request-count* 1))
+	  ;; This can be here but needs controls to ensure it doesn't run more than every 4 seconds
+	  ;; (rmt:dat->json-str
+	  ;;  (if (or (string? res)
+	  ;;          (list?   res)
+	  ;;          (number? res)
+	  ;;          (boolean? res))
+	  ;;      res 
+	  ;;      (list "ERROR, not string, list, number or boolean" 1 cmd params res)))))
+	  (db:obj->string res transport: 'http))
+	(begin
+	  (debug:print 0 *default-log-port*   "Login failed server-id mismatch: " key ", " *server-id*) 
+	  (db:obj->string (conc "Login failed server-id mismatch: " key ", " *server-id*) transport: 'http)))))
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -598,15 +598,18 @@
                                       (res (system sync-cmd))
                                       (dbbackupfile (conc mtdbfile ".backup"))
                                       (res2 
                                        (cond
                                         ((eq? 0 res )
+                                         (handle-exceptions
+                                            exn
+                                            #f
                                          (if (file-exists? dbbackupfile)
 		                           (delete-file* dbbackupfile)
                                          )
                                          (if (eq? 0 (file-size sync-log))
-                                             (delete-file sync-log))
+                                             (delete-file* sync-log))
 		                         (system (conc "/bin/mv " staging-file " " mtdbfile))
                                          
                                          (set! last-sync-seconds (/ (- (current-milliseconds) start-time) 1000))
                                          (set! off-time (calculate-off-time
                                                          last-sync-seconds
@@ -617,11 +620,11 @@
                                                            (debug:print 0 *default-log-port* "WARNING: ["(common:human-time)"] server.sync-duty-cycle is invalid.  Should be a number between 0 and 1, but "duty-cycle" was specified.  Using default value: "default-duty-cycle)
                                                            default-duty-cycle))))
                                          
                                          (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec")
                                          (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec ; with duty-cycle of "duty-cycle" off time is now "off-time)
-                                         'sync-completed)
+                                         'sync-completed))
                                         (else
                                          (system (conc "/bin/cp "sync-log" "sync-log".fail"))
                                          (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail")
                                          (if (file-exists? (conc mtdbfile ".backup"))
                                              (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile)))