Overview
| Comment: | Merged server-fix |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.64-new-pkts |
| Files: | files | file ages | folders |
| SHA1: |
1de85e740b727e6adb892ca0ef6bcb87 |
| User & Date: | matt on 2017-03-20 13:35:28 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-03-20
| ||
| 15:15 | merged v1.64-new-pkts check-in: 77cb77fb6a user: bjbarcla tags: v1.64 | |
| 13:35 | Merged server-fix Closed-Leaf check-in: 1de85e740b user: matt tags: v1.64-new-pkts | |
| 12:50 | Merged in homehost-protection patch check-in: 25c202aa9d user: matt tags: v1.64-new-pkts | |
| 12:12 | missing server fix commit Closed-Leaf check-in: 74d9575642 user: matt tags: server-fix | |
Changes
Modified cgisetup/models/pgdb.scm from [c3a02037dc] to [0f76410646].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | ;; (import chicken) (use typed-records (prefix dbi dbi:)) ;; given a configdat lookup the connection info and open the db ;; (define (pgdb:open configdat #!key (dbname #f)) | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
;; (import chicken)
(use typed-records (prefix dbi dbi:))
;; given a configdat lookup the connection info and open the db
;;
(define (pgdb:open configdat #!key (dbname #f))
(let ((pgconf (or (configf:lookup configdat "ext-sync" (or dbname "pgdb")) (args:get-arg "-pgsync"))))
(if pgconf
(let* ((confdat (map (lambda (conf-item)
(let ((parts (string-split conf-item ":")))
(if (> (length parts) 1)
(let ((key (car parts))
(val (cadr parts)))
(cons (string->symbol key) val))
|
| ︙ | ︙ |
Modified megatest.scm from [45d18034d7] to [b75104b2c8].
| ︙ | ︙ | |||
286 287 288 289 290 291 292 293 294 295 296 297 298 299 |
"-target-db"
"-source-db"
"-src-target"
"-src-runname"
"-diff-email"
"-sync-to"
"-diff-html"
)
(list "-h" "-help" "--help"
"-manual"
"-version"
"-force"
"-xterm"
| > > | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 |
"-target-db"
"-source-db"
"-src-target"
"-src-runname"
"-diff-email"
"-sync-to"
"-prefix-target"
"-pgsync"
"-diff-html"
)
(list "-h" "-help" "--help"
"-manual"
"-version"
"-force"
"-xterm"
|
| ︙ | ︙ |
Modified tasks.scm from [9d362c0818] to [e18dae9779].
| ︙ | ︙ | |||
614 615 616 617 618 619 620 |
(define (tasks:run-id->mtpg-run-id dbh cached-info run-id)
(let* ((runs-ht (hash-table-ref cached-info 'runs))
(runinf (hash-table-ref/default runs-ht run-id #f)))
(if runinf
runinf ;; already cached
(let* ((keytarg (string-intersperse (rmt:get-keys) "/")) ;; e.g. version/iteration/platform
(spec-id (pgdb:get-ttype dbh keytarg))
| | | 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 |
(define (tasks:run-id->mtpg-run-id dbh cached-info run-id)
(let* ((runs-ht (hash-table-ref cached-info 'runs))
(runinf (hash-table-ref/default runs-ht run-id #f)))
(if runinf
runinf ;; already cached
(let* ((keytarg (string-intersperse (rmt:get-keys) "/")) ;; e.g. version/iteration/platform
(spec-id (pgdb:get-ttype dbh keytarg))
(target (if (and (args:get-arg "-sync-to") (args:get-arg "-prefix-target")) (set! target (conc (args:get-arg "-prefix-target") (rmt:get-target run-id))) (rmt:get-target run-id))) ;; e.g. v1.63/a3e1/ubuntu
(run-dat (rmt:get-run-info run-id)) ;; NOTE: get-run-info returns a vector < row header >
(run-name (rmt:get-run-name-from-id run-id))
(new-run-id (pgdb:get-run-id dbh spec-id target run-name))
(row (db:get-rows run-dat)) ;; yes, this returns a single row
(header (db:get-header run-dat))
(state (db:get-value-by-header row header "state "))
(status (db:get-value-by-header row header "status"))
|
| ︙ | ︙ |