Overview
| Comment: | client setup was not updating runremote in some scenarios |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.80-toomanyfiles |
| Files: | files | file ages | folders |
| SHA1: |
3f4bf437c0118baf29f28272e3eab494 |
| User & Date: | matt on 2023-01-19 03:46:12 |
| Other Links: | branch diff | manifest | tags |
Context
|
2023-01-19
| ||
| 04:14 | Removed added attempt to save server info in runremote. check-in: b290688bbb user: matt tags: v1.80-toomanyfiles | |
| 03:46 | client setup was not updating runremote in some scenarios check-in: 3f4bf437c0 user: matt tags: v1.80-toomanyfiles | |
|
2023-01-18
| ||
| 22:17 | Missing fix check-in: c608ac13c7 user: matt tags: v1.80 | |
Changes
Modified client.scm from [6913337164] to [5b47d90716].
| ︙ | ︙ | |||
98 99 100 101 102 103 104 | (if (not server-dat) ;; no server found (begin (if (< remaining-tries 99)(thread-sleep! 1)) ;; obviously it needs time (client:setup-http areapath runremote remaining-tries: (- remaining-tries 1))) (match server-dat ((host port start-time server-id pid) (debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries) | | > | > > > | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 |
(if (not server-dat) ;; no server found
(begin
(if (< remaining-tries 99)(thread-sleep! 1)) ;; obviously it needs time
(client:setup-http areapath runremote remaining-tries: (- remaining-tries 1)))
(match server-dat
((host port start-time server-id pid)
(debug:print-info 4 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
(if (or (not runremote)
(not (remote-conndat runremote)))
(begin
;; Here we are creating a runremote where there was none or it was clobbered with #f
;;
(set! runremote (make-remote))
(let* ((server-info (server:check-if-running areapath)))
(remote-server-info-set! runremote server-info)
(if server-info
(begin
(remote-server-url-set! runremote (server:record->url server-info))
(remote-server-id-set! runremote (server:record->id server-info)))))))
;; at this point we have a runremote
(if (and host port server-id)
(let* ((nada (client:connect host port server-id runremote))
(ping-res (rmt:login-no-auto-client-setup runremote)))
(if ping-res
(if runremote
(begin ;; updating info in runremote
(debug:print-info 2 *default-log-port* "connected to " (client:get-url runremote))
(remote-server-info-set! runremote server-info)
(remote-server-url-set! runremote (server:record->url server-info))
(remote-server-id-set! runremote (server:record->id server-info))
runremote)
(client:setup-http areapath runremote remaining-tries: (- remaining-tries 1)))
(begin ;; login failed but have a server record, clean out the record and try again
(debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... ping-res=" ping-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332
(http-transport:close-connections runremote)
(thread-sleep! 1)
(client:setup-http areapath runremote remaining-tries: (- remaining-tries 1))
|
| ︙ | ︙ |