Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -67,22 +67,37 @@ (print "INFO: Exectuing main server loop") (access-log "megatest-http.log") (server-bind-address #f) (define-page (main-page-path) (lambda () - (with-request-variables (dat) + (let ((dat ($ "dat"))) + ;; (with-request-variables (dat) (debug:print-info 12 "Got dat=" dat) (let* ((packet (db:string->obj dat)) (qtype (cdb:packet-get-qtype packet))) (debug:print-info 12 "server=> received packet=" packet) (if (not (member qtype '(sync ping))) (begin (mutex-lock! *heartbeat-mutex*) (set! *last-db-access* (current-seconds)) (mutex-unlock! *heartbeat-mutex*))) - (open-run-close db:process-queue-item open-db packet)))))) + (let ((res (open-run-close db:process-queue-item open-db packet))) + (debug:print-info 11 "Return value from db:process-queue-item is " res) + res)))))) +;;; (use spiffy uri-common intarweb) +;;; +;;; (root-path "/var/www") +;;; +;;; (vhost-map `(((* any) . ,(lambda (continue) +;;; (if (equal? (uri-path (request-uri (current-request))) +;;; '(/ "hey")) +;;; (send-response body: "hey there!\n" +;;; headers: '((content-type text/plain))) +;;; (continue)))))) +;;; +;;; (start-server port: 12345) ;; This is recursively run by server:run until sucessful ;; (define (server:try-start-server ipaddrstr portnum) (handle-exceptions @@ -137,13 +152,17 @@ ;; ;; 1 Hello, world! Goodbye Dolly ;; Send msg to serverdat and receive result (define (server:client-send-receive serverdat msg) (let* ((url (server:make-server-url serverdat)) - (fullurl (conc url "/?dat=" msg))) + (fullurl url)) ;; (conc url "/?dat=" msg))) (debug:print-info 11 "fullurl=" fullurl "\n") - (let* ((res (with-input-from-request fullurl #f read-string))) + (let* ((res (with-input-from-request fullurl + ;; #f + ;; msg + (list (cons 'dat msg)) + read-string))) (debug:print-info 11 "got res=" res) (let ((match (string-search (regexp "(.*)<.body>") res))) (debug:print-info 11 "match=" match) (let ((final (cadr match))) (debug:print-info 11 "final=" final) @@ -267,12 +286,10 @@ (open-run-close tasks:server-deregister-self tasks:open-db (get-host-name)) (thread-sleep! 1) (debug:print-info 0 "Max cached queries was " *max-cache-size*) (debug:print-info 0 "Server shutdown complete. Exiting") (exit))))))) - - ;; all routes though here end in exit ... (define (server:launch) (if (not *toppath*) (if (not (setup-for-run))