Overview
| Comment: | Got the beginings of the api working properly |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | refactor-api |
| Files: | files | file ages | folders |
| SHA1: |
f737352b706eb09a39eb3f13d2a3326c |
| User & Date: | matt on 2013-07-28 16:54:12 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-07-28
| ||
| 20:38 | Added some missing files, more bits of new api in place check-in: d1dbb768c6 user: matt tags: refactor-api | |
| 16:54 | Got the beginings of the api working properly check-in: f737352b70 user: matt tags: refactor-api | |
| 14:57 | Partial implementation of /api check-in: 41cad6ae52 user: matt tags: refactor-api | |
Changes
Modified http-transport.scm from [1ebf902b5c] to [56910ff5a9].
| ︙ | ︙ | |||
98 99 100 101 102 103 104 105 106 107 108 109 110 111 | (if (not db)(set! db (open-db))) (let* (($ (request-vars source: 'both)) (dat ($ 'dat)) (res #f)) (cond ((equal? (uri-path (request-uri (current-request))) '(/ "api")) (send-response body: (api:process-request db $) ;; the $ is the request vars proc headers: '((content-type text/plain)))) ;; This is the /ctrl path where data is handed to the server and ;; responses ((equal? (uri-path (request-uri (current-request))) '(/ "ctrl")) (let* ((packet (db:string->obj dat)) | > | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | (if (not db)(set! db (open-db))) (let* (($ (request-vars source: 'both)) (dat ($ 'dat)) (res #f)) (cond ((equal? (uri-path (request-uri (current-request))) '(/ "api")) (print "Got api request") (send-response body: (api:process-request db $) ;; the $ is the request vars proc headers: '((content-type text/plain)))) ;; This is the /ctrl path where data is handed to the server and ;; responses ((equal? (uri-path (request-uri (current-request))) '(/ "ctrl")) (let* ((packet (db:string->obj dat)) |
| ︙ | ︙ | |||
291 292 293 294 295 296 297 | (mutex-unlock! *http-mutex*))) (time-out (lambda () (thread-sleep! 45) (if (not res) (begin (debug:print 0 "WARNING: communication with the server timed out.") (mutex-unlock! *http-mutex*) | | | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | (mutex-unlock! *http-mutex*))) (time-out (lambda () (thread-sleep! 45) (if (not res) (begin (debug:print 0 "WARNING: communication with the server timed out.") (mutex-unlock! *http-mutex*) (http-transport:client-api-send-receive serverdat cmd params numretries: (- numretries 1)) (if (< numretries 3) ;; on last try just exit (begin (debug:print 0 "ERROR: communication with the server timed out. Giving up.") (exit 1))))))) (th1 (make-thread send-recieve "with-input-from-request")) (th2 (make-thread time-out "time out"))) (thread-start! th1) |
| ︙ | ︙ |