Comment: | Added slow forced exit on servers |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
60523d6242b79520ac873aece4c0a974 |
User & Date: | mrwellan on 2015-10-27 10:27:22 |
Other Links: | branch diff | manifest | tags |
2015-10-27
| ||
10:53 | added log rotation check-in: 07a846ca8f user: mrwellan tags: v1.60 | |
10:27 | Added slow forced exit on servers check-in: 60523d6242 user: mrwellan tags: v1.60 | |
2015-10-22
| ||
10:57 | Fixed some logic in list-runs for ods check-in: b80779dbbd user: mrwellan tags: v1.60 | |
Modified db.scm from [ed41e04ebd] to [4086ee6f36].
650 651 652 653 654 655 656 | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 | + - + | (db:dbdat-get-db fromdb) full-sel) ;; tack on remaining records in fromdat (if (not (null? fromdat)) (set! fromdats (cons fromdat fromdats))) (if (common:low-noise-print 120 "sync-records") |
693 694 695 696 697 698 699 | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 | - + | fromdat-lst)) )) fromdats) (sqlite3:finalize! stmth))) (append (list todb) slave-dbs)))) tbls) (let* ((runtime (- (current-milliseconds) start-time)) |
Modified http-transport.scm from [8ea8f1dd96] to [96dc217b5c].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | - - + + | ;; Copyright 2006-2012, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (require-extension (srfi 18) extras tcp s11n) |
355 356 357 358 359 360 361 362 363 364 365 366 367 368 | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 | + | ;; (define (http-transport:keep-running server-id run-id) ;; if none running or if > 20 seconds since ;; server last used then start shutdown ;; This thread waits for the server to come alive (debug:print-info 0 "Starting the sync-back, keep alive thread in server for run-id=" run-id) (let* ((tdbdat (tasks:open-db)) (server-start-time (current-seconds)) (server-info (let loop ((start-time (current-seconds)) (changed #t) (last-sdat "not this")) (let ((sdat #f)) (thread-sleep! 0.01) (debug:print-info 0 "Waiting for server alive signature") (mutex-lock! *heartbeat-mutex*) |
458 459 460 461 462 463 464 | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + | ;; (debug:print 11 "last-access=" last-access ", server-timeout=" server-timeout) ;; ;; no_traffic, no running tests, if server 0, no running servers ;; ;; (let ((wait-on-running (configf:lookup *configdat* "server" "wait-on-running"))) ;; wait on running tasks (if not true then exit on time out) ;; (let* ((hrs-since-start (/ (- (current-seconds) server-start-time) 3600)) (adjusted-timeout (if (> hrs-since-start 1) (- server-timeout (* hrs-since-start 60)) ;; subtract 60 seconds per hour server-timeout))) (if (common:low-noise-print 120 "server timeout") (debug:print-info 0 "Adjusted server timeout: " adjusted-timeout)) |