Overview
| Comment: | corrected a debug:print syntax, corrected the match for servinfo content |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.8031 |
| Files: | files | file ages | folders |
| SHA1: |
3a97630ba6edf0b60762896b9c1f5050 |
| User & Date: | mmgraham on 2024-03-14 17:53:10 |
| Other Links: | branch diff | manifest | tags |
Context
|
2024-03-21
| ||
| 17:47 | handled the missing args:remove-arg-from-ht check-in: 6fa246c867 user: mmgraham tags: v1.8031 | |
|
2024-03-14
| ||
| 17:53 | corrected a debug:print syntax, corrected the match for servinfo content check-in: 3a97630ba6 user: mmgraham tags: v1.8031 | |
|
2024-03-13
| ||
| 18:06 | Made it delete .servinfo files only if older than server timeout. Disabled some unnecessary messages. check-in: f184bcc661 user: mmgraham tags: v1.8031 | |
Changes
Modified dbmod.scm from [4cd67b59a2] to [7686817692].
| ︙ | ︙ | |||
506 507 508 509 510 511 512 | ;; for each table ;; insert into dest.<table> select * from src.<table> where last_update>last_update ;; done (debug:print 2 *default-log-port* "Attaching "destdbfile" as auxdb") (handle-exceptions exn (begin | | | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 |
;; for each table
;; insert into dest.<table> select * from src.<table> where last_update>last_update
;; done
(debug:print 2 *default-log-port* "Attaching "destdbfile" as auxdb")
(handle-exceptions
exn
(begin
(debug:print 0 *default-log-port* "ATTACH failed, exiting. exn="(condition->list exn))
(exit 1))
(sqlite3:execute dbh (conc "ATTACH '"destdbfile"' AS auxdb;")))
(for-each
(lambda (table)
(let* ((dummy (debug:print 2 *default-log-port* "Doing table " table))
(tbldat (alist-ref table tables equal?))
(fields (map car tbldat))
|
| ︙ | ︙ |
Modified tcp-transportmod.scm from [f39a70ad97] to [5ace6e2c23].
| ︙ | ︙ | |||
530 531 532 533 534 535 536 | (let loop ((servrs servers) (prime-host #f) (result '())) (if (null? servrs) (reverse result) (let* ((servdat (car servrs))) (match servdat | | > > | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 |
(let loop ((servrs servers)
(prime-host #f)
(result '()))
(if (null? servrs)
(reverse result)
(let* ((servdat (car servrs)))
(match servdat
((host port startseconds server-id pid dbfilename servinfofile)
(debug:print-info 0 *default-log-port* "Good servinfo file: " servdat)
(let* ((ping-res (tt:timed-ping host port server-id))
(good-ping (match ping-res
((result . ping-time)
(not result)) ;; we couldn't reach the server or it was not a megatest server
(else #f))) ;; the ping failed completely?
(same-host (or (not prime-host) ;; i.e. this is the first host
(equal? prime-host host)))
(keep-srv (and good-ping same-host)))
(if keep-srv
(loop (cdr servrs)
host
(cons servdat result))
(begin
;; (debug:print-info 0 *default-log-port* "good-ping: " good-ping " same-host: " same-host "keep-srv: " keep-srv)
(handle-exceptions
exn
(debug:print-info 0 *default-log-port* "Error removing server info file: "servinfofile", "
(condition->list exn))
(delete-file* servinfofile))
(loop (cdr servrs) prime-host result)))))
(else
|
| ︙ | ︙ |