Overview
Comment: | Fixed couple issues with setting server timeout. Reverted viewscreen to start in background as it didn't work properly without that. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.80 |
Files: | files | file ages | folders |
SHA1: |
dda2fe1e9e0fbc982c5da9dfea25e5f5 |
User & Date: | matt on 2023-03-14 09:26:01 |
Other Links: | branch diff | manifest | tags |
Context
2023-03-14
| ||
11:17 | Merged fork check-in: d8ef55d077 user: mrwellan tags: v1.80 | |
09:26 | Fixed couple issues with setting server timeout. Reverted viewscreen to start in background as it didn't work properly without that. check-in: dda2fe1e9e user: matt tags: v1.80 | |
08:06 | Make server timeout configurable using existing settings check-in: ad08451b0a user: matt tags: v1.80 | |
Changes
Modified commonmod.scm from [09e197a941] to [ff27fc279a].
︙ | |||
316 317 318 319 320 321 322 | 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | - + + - + + + | ;;====================================================================== ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5 (define (common:hms-string->seconds tstr) (let ((parts (string-split-fields "\\w+" tstr)) (time-secs 0) ;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks |
︙ |
Modified server.scm from [3fa5d1e55d] to [851da574f1].
︙ | |||
729 730 731 732 733 734 735 | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 | - - - - - + + + + + + + + | #f))) ;; timeout is hms string: 1h 5m 3s, default is 1 minute ;; This is currently broken. Just use the number of hours with no unit. ;; Default is 60 seconds. ;; (define (server:expiration-timeout) |
︙ |
Modified tcp-transportmod.scm from [dde6c522b1] to [8f58514e4b].
︙ | |||
102 103 104 105 106 107 108 | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | - + | (last-access (current-seconds)) (servinf-file #f) (last-serv-start 0) ) ;; parameters ;; |
︙ | |||
273 274 275 276 277 278 279 | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | + + - + | (sfiles (tt:find-server areapath dbfname)) (sdats (filter car (map tt:server-get-info sfiles))) ;; first element is #f if the file disappeared while being read (sorted (sort sdats (lambda (a b) (< (list-ref a 2)(list-ref b 2))))) (count 0)) (for-each (lambda (rec) (if (or (> (length sorted) 1) (common:low-noise-print 120 "server info sorted")) |
︙ | |||
408 409 410 411 412 413 414 | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | - + + | (debug:print 0 *default-log-port* "Got server lock for " dbfname) (set! db-locked-in #t) #t) (begin (debug:print 0 *default-log-port* "Failed to get server lock for "dbfname) #f)))))) |
︙ |
Modified utils/viewscreen from [fb076cca7f] to [fe2bbf9f4f].
︙ | |||
14 15 16 17 18 19 20 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | - + - + | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Megatest. If not, see <http://www.gnu.org/licenses/>. if ! type screen &> /dev/null;then |