Overview
| Comment: | working again - with local access |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | try-nanomsg |
| Files: | files | file ages | folders |
| SHA1: |
537794538415273551d4914630fcbffc |
| User & Date: | matt on 2014-11-24 20:29:01 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-11-24
| ||
| 23:36 | several little fixes check-in: 308a5d65b6 user: matt tags: try-nanomsg | |
| 20:29 | working again - with local access check-in: 5377945384 user: matt tags: try-nanomsg | |
| 17:01 | Misc changes, add usage to plot-code. Add build of nanomsg to Makefile.installall. Add comment to runs.scm check-in: 304bfdeed0 user: mrwellan tags: try-nanomsg | |
Changes
Modified api.scm from [923a47fb5f] to [52a89446cf].
| ︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
get-runs-by-patt
get-steps-data
login
testmeta-get-record))
;; These are called by the server on recipt of /api calls
;; - keep it simple, only return the actual result of the call, i.e. no meta info here
;;
(define (api:execute-requests dbstruct cmd params)
(let ((res
(case (if (symbol? cmd)
cmd
(string->symbol cmd))
;; SERVERS
| > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
get-runs-by-patt
get-steps-data
login
testmeta-get-record))
;; These are called by the server on recipt of /api calls
;; - keep it simple, only return the actual result of the call, i.e. no meta info here
;;
;; - returns #( flag result )
;;
(define (api:execute-requests dbstruct cmd params)
(let ((res
(case (if (symbol? cmd)
cmd
(string->symbol cmd))
;; SERVERS
|
| ︙ | ︙ | |||
143 144 145 146 147 148 149 | ;; ;; NB// Runs on the server as part of the server loop ;; (define (api:process-request dbstruct $) ;; the $ is the request vars proc (let* ((cmd ($ 'cmd)) (paramsj ($ 'params)) (params (db:string->obj paramsj)) ;; (rmt:json-str->dat paramsj)) | | > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
;;
;; NB// Runs on the server as part of the server loop
;;
(define (api:process-request dbstruct $) ;; the $ is the request vars proc
(let* ((cmd ($ 'cmd))
(paramsj ($ 'params))
(params (db:string->obj paramsj)) ;; (rmt:json-str->dat paramsj))
(resdat (api:execute-requests dbstruct cmd params)) ;; #( flag result )
(res (vector-ref resdat 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)))
|
Modified rmt.scm from [1fd758a7a4] to [e6ea17e36c].
| ︙ | ︙ | |||
178 179 180 181 182 183 184 |
(let* ((dbdir (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
(db (make-dbr:dbstruct path: dbdir local: #t)))
(set! *dbstruct-db* db)
db)))
(db-file-path (db:dbfile-path 0)))
;; (read-only (not (file-read-access? db-file-path)))
(let* ((start (current-milliseconds))
| | > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 |
(let* ((dbdir (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
(db (make-dbr:dbstruct path: dbdir local: #t)))
(set! *dbstruct-db* db)
db)))
(db-file-path (db:dbfile-path 0)))
;; (read-only (not (file-read-access? db-file-path)))
(let* ((start (current-milliseconds))
(resdat (api:execute-requests dbstruct-local (symbol->string cmd) params))
(res (vector-ref resdat 1))
(duration (- (current-milliseconds) start)))
(rmt:update-db-stats run-id cmd params duration)
;; mark this run as dirty if this was a write
(if (not (member cmd api:read-only-queries))
(let ((start-time (current-seconds)))
(mutex-lock! *db-multi-sync-mutex*)
;; (if (not (hash-table-ref/default *db-local-sync* run-id #f))
|
| ︙ | ︙ |