Overview
| Comment: | Merged v1.65 From: a23cf8b5b90f8030125441c7ee17443e4c5a45e7 User: matt |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65-real-ulex |
| Files: | files | file ages | folders |
| SHA1: |
d47bbdf4bea2d95704c005c2df0ef245 |
| User & Date: | matt on 2021-02-25 23:12:54 |
| Other Links: | branch diff | manifest | tags |
Context
|
2021-02-25
| ||
| 23:12 | Merged v1.65 fixes From: 25464d7c31b5b9dca5dca09ab6f72309cdbb658a User: matt check-in: 40f92fb75e user: matt tags: v1.65-real-ulex (unpublished) | |
| 23:12 | Merged v1.65 From: a23cf8b5b90f8030125441c7ee17443e4c5a45e7 User: matt check-in: d47bbdf4be user: matt tags: v1.65-real-ulex (unpublished) | |
| 23:12 | Merged in v1.65, fixed Makefile and removed pkts from megatest/ulex.scm From: 96e98c0e2cd3c8b7f71f8667bfc5874dfb86c0a3 User: matt check-in: 8c461d1e04 user: matt tags: v1.65-real-ulex (unpublished) | |
Changes
Modified http-transport.scm from [2202b22e9f] to [af252f2ba1].
| ︙ | ︙ | |||
574 575 576 577 578 579 580 | (let* ((tmp-area (common:get-db-tmp-area)) (server-start (conc tmp-area "/.server-start")) (server-started (conc tmp-area "/.server-started")) (start-time (common:lazy-modification-time server-start)) (started-time (common:lazy-modification-time server-started)) (server-starting (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting (start-time-old (> (- (current-seconds) start-time) 5)) | | > | > > > | > | | | 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 |
(let* ((tmp-area (common:get-db-tmp-area))
(server-start (conc tmp-area "/.server-start"))
(server-started (conc tmp-area "/.server-started"))
(start-time (common:lazy-modification-time server-start))
(started-time (common:lazy-modification-time server-started))
(server-starting (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
(start-time-old (> (- (current-seconds) start-time) 5))
(cleanup-proc (lambda (msg) ;; would like to use (modulo (current-seconds) 60) instead of process-id to wrap filenames
(let* ((serv-fname (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
(new-fname (conc "server-" (modulo (current-seconds) 60) "-" (get-host-name) ".log"))
(full-serv-fname (conc *toppath* "/logs/" serv-fname))
;; (new-serv-fname (conc *toppath* "/logs/" "defunct-" serv-fname))
(new-serv-fname (conc *toppath* "/logs/" new-fname))
)
(debug:print 0 *default-log-port* msg)
(if (common:file-exists? full-serv-fname)
(with-output-to-pipe "at now + 10 minutes" (lambda ()
(print "mv -f " full-serv-fname " " new-serv-fname)))
;; (system (conc "sleep 10;mv -f " full-serv-fname " " new-serv-fname))
(debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
(exit)))))
(if (and (not start-time-old) ;; last server start try was less than five seconds ago
(not server-starting))
(begin
(cleanup-proc "NOT starting server, there is either a recently started server or a server in process of starting")
(exit)))
;; lets not even bother to start if there are already three or more server files ready to go
(let* ((num-alive (server:get-num-alive (server:get-list *toppath*))))
(if (> num-alive 3)
(begin
(cleanup-proc (conc "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up"))
(exit))))
(common:save-pkt `((action . start)
(T . server)
(pid . ,(current-process-id)))
|
| ︙ | ︙ |