Overview
Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.6584-ck5 |
Files: | files | file ages | folders |
SHA1: |
f9e738a1caf4e3f08ee850244a409691 |
User & Date: | matt on 2021-05-20 23:29:52 |
Other Links: | branch diff | manifest | tags |
Context
2021-05-21
| ||
22:45 | wip check-in: 0fe5a238ee user: matt tags: v1.6584-ck5 | |
2021-05-20
| ||
23:29 | wip check-in: f9e738a1ca user: matt tags: v1.6584-ck5 | |
21:23 | wip check-in: 3576b029da user: matt tags: v1.6584-ck5 | |
Changes
Modified dbmod.scm from [43fca71bc1] to [4c56626e6f].
︙ | |||
328 329 330 331 332 333 334 | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 | - + - + + - + | (define (db:with-db dbstruct run-id r/w proc . params) (assert (dbr:dbstruct? dbstruct) "FATAL: db:with-db called with bad dbstruct") (let* ((dbpath (db:run-id->dbname run-id)) (dbdat (db:get-dbdat dbstruct *toppath* dbpath)) (db (dbr:dbdat-inmem dbdat)) (fname (dbr:dbdat-fname dbdat)) (use-mutex (> *api-process-request-count* 25))) ;; was 25 |
︙ | |||
1266 1267 1268 1269 1270 1271 1272 | 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 | - + + - + | (sqlite3:execute db "CREATE TABLE IF NOT EXISTS servers (id INTEGER PRIMARY KEY, host TEXT, port INTEGER, servkey TEXT, pid TEXT, ipaddr TEXT, |
︙ | |||
5515 5516 5517 5518 5519 5520 5521 | 5517 5518 5519 5520 5521 5522 5523 5524 5525 5526 5527 5528 5529 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5540 5541 5542 5543 5544 5545 5546 5547 5548 5549 5550 5551 5552 5553 5554 5555 | - + + + + + + + + + + - - - + + + + - - + + - - + + | ;;====================================================================== ;; S E R V E R R E C O R D S ;;====================================================================== ;; these are all intended to be run against main.db ;; run this one in a transaction where first check if host:port is taken |
Modified fullrununit.sh from [3ffa0b3716] to [12bf13749e].
1 2 | 1 2 3 4 5 6 | - + | #!/bin/bash |
Modified rmtmod.scm from [faeb47f828] to [d0cb393e69].
︙ | |||
259 260 261 262 263 264 265 | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - + - + | #t) (start-main-srv))) (start-main-srv)))) ;; NB// remote is a rmt:remote struct ;; (define (rmt:general-open-connection remote apath dbname #!key (num-tries 5)) (let ((mdbname (db:run-id->dbname #f))) |
︙ | |||
669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 | 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 | + + + | (rmt:send-receive 'get-runs-cnt-by-patt #f (list runpatt targetpatt keys))) ;; Use the special run-id == #f scenario here since there is no run yet (define (rmt:register-run keyvals runname state status user contour) ;; first register in main.db (thus the #f) (let* ((run-id (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))) ;; now register in the run db itself ;; NEED A RECORD INSERT INCLUDING SETTING id (rmt:send-receive 'register-run run-id (list keyvals runname state status user contour)) run-id)) (define (rmt:get-run-name-from-id run-id) (rmt:send-receive 'get-run-name-from-id run-id (list run-id))) (define (rmt:delete-run run-id) (rmt:send-receive 'delete-run run-id (list run-id))) |
︙ | |||
1492 1493 1494 1495 1496 1497 1498 | 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 | - + | (debug:print-info 0 *default-log-port* "Releasing lock for "dbfile) (db:with-lock-db (servdat-dbfile *server-info*) (lambda (dbh dbfile) (db:release-lock dbh dbfile)))) (let* ((sdat *server-info*)) ;; we have a run-id server (rmt:send-receive-real *rmt:remote* *toppath* (db:run-id->dbname #f) |
︙ | |||
2269 2270 2271 2272 2273 2274 2275 | 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 | - + + - - - - - - + + + + + + + | (begin (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server") (exit)) (loop start-time (equal? sdat last-sdat) sdat)))))))) |
︙ |
Modified tests/unittests/basicserver.scm from [d917ba01d8] to [67b7c04b63].
︙ | |||
62 63 64 65 66 67 68 | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | - + + - + + - + - + + + + - + | '(a "b" 123 1.23 ))) (test #f #t (number? (rmt:send-receive 'ping #f 'hello))) (define *db* (db:setup #f)) ;; these let me cut and paste from source easily (define apath *toppath*) |
︙ |