Overview
Comment: | Better err msg |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
738756b2392c295786b93851012ebc4a |
User & Date: | mrwellan on 2014-11-21 13:18:51 |
Other Links: | branch diff | manifest | tags |
Context
2014-11-24
| ||
12:45 | Fixed import-megatest.db bug check-in: 398c48390d user: mrwellan tags: v1.60, v1.6006 | |
2014-11-22
| ||
12:53 | try nanomsg. check-in: 45e51acb2a user: matt tags: try-nanomsg | |
2014-11-21
| ||
13:18 | Better err msg check-in: 738756b239 user: mrwellan tags: v1.60 | |
10:56 | Added layer of exception handling inside db:with-db check-in: 171838c893 user: mrwellan tags: v1.60 | |
Changes
Modified client.scm from [406d30b1f6] to [6d1c8717b3].
︙ | ︙ | |||
53 54 55 56 57 58 59 | ;; ;; client:setup ;; ;; lookup_server, need to remove *runremote* stuff ;; (define (client:setup run-id #!key (remaining-tries 100) (failed-connects 0)) (debug:print-info 2 "client:setup remaining-tries=" remaining-tries) | | < | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | ;; ;; client:setup ;; ;; lookup_server, need to remove *runremote* stuff ;; (define (client:setup run-id #!key (remaining-tries 100) (failed-connects 0)) (debug:print-info 2 "client:setup remaining-tries=" remaining-tries) (let* ((tdbdat (tasks:open-db))) (if (<= remaining-tries 0) (begin (debug:print 0 "ERROR: failed to start or connect to server for run-id " run-id) (exit 1)) (let ((host-info (hash-table-ref/default *runremote* run-id #f))) (if host-info (let* ((iface (http-transport:server-dat-get-iface host-info)) |
︙ | ︙ | |||
114 115 116 117 118 119 120 | (client:setup run-id remaining-tries: (- remaining-tries 1))))) (begin ;; no server registered (let ((num-available (tasks:num-in-available-state (db:dbdat-get-db tdbdat) run-id))) (debug:print-info 0 "client:setup, no server registered, remaining-tries=" remaining-tries " num-available=" num-available) (thread-sleep! 2) (if (< num-available 2) (begin | < | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | (client:setup run-id remaining-tries: (- remaining-tries 1))))) (begin ;; no server registered (let ((num-available (tasks:num-in-available-state (db:dbdat-get-db tdbdat) run-id))) (debug:print-info 0 "client:setup, no server registered, remaining-tries=" remaining-tries " num-available=" num-available) (thread-sleep! 2) (if (< num-available 2) (begin (server:try-running run-id))) (thread-sleep! 10) ;; give server a little time to start up (client:setup run-id remaining-tries: (- remaining-tries 1))))))))))) ;; keep this as a function to ease future (define (client:start run-id server-info) (http-transport:client-connect (tasks:hostinfo-get-interface server-info) |
︙ | ︙ |
Modified db.scm from [5465f7a4df] to [d3e0e30a50].
︙ | ︙ | |||
105 106 107 108 109 110 111 | (db:get-db dbstruct run-id) dbstruct)) ;; cheat, allow for passing in a dbdat (db (db:dbdat-get-db dbdat))) (db:delay-if-busy dbdat) (handle-exceptions exn (begin | | | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | (db:get-db dbstruct run-id) dbstruct)) ;; cheat, allow for passing in a dbdat (db (db:dbdat-get-db dbdat))) (db:delay-if-busy dbdat) (handle-exceptions exn (begin (debug:print 0 "ERROR: sqlite3 issue in db:with-db, dbstruct=" dbstruct ", run-id=" run-id ", proc=" proc ", params=" params " error: " ((condition-property-accessor 'exn 'message) exn)) (print-call-chain (current-error-port))) (let ((res (apply proc db params))) (if (vector? dbstruct)(db:done-with dbstruct run-id r/w)) res)))) ;;====================================================================== ;; K E E P F I L E D B I N dbstruct |
︙ | ︙ |
Modified dcommon.scm from [e887ed7ced] to [31fd59f2b3].
︙ | ︙ | |||
445 446 447 448 449 450 451 | (iup:attribute-set! stats-matrix "WIDTHDEF" "40") (iup:vbox ;; (iup:label "Run statistics" #:expand "HORIZONTAL") stats-matrix))) (define (dcommon:servers-table) (let* ((tdbdat (tasks:open-db)) | < | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | (iup:attribute-set! stats-matrix "WIDTHDEF" "40") (iup:vbox ;; (iup:label "Run statistics" #:expand "HORIZONTAL") stats-matrix))) (define (dcommon:servers-table) (let* ((tdbdat (tasks:open-db)) (colnum 0) (rownum 0) (servers-matrix (iup:matrix #:expand "YES" #:numcol 7 #:numcol-visible 7 #:numlin-visible 5 )) |
︙ | ︙ |