Overview
| Comment: | changed Server is in dbprep and no servers running messages to debug 2. Removed the use of grep to find exited server logs. changed the use of numservers to select between 1 to numservers. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 | v1.6586 |
| Files: | files | file ages | folders |
| SHA1: |
3da36b7bfbc233f44e8687111f80c2ec |
| User & Date: | mmgraham on 2021-06-12 17:41:01 |
| Other Links: | branch diff | manifest | tags |
Context
|
2021-06-23
| ||
| 11:06 | Removed the wrapper for config:assoc-safe-add check-in: 7a32ddd847 user: mmgraham tags: v1.65 | |
|
2021-06-12
| ||
| 17:41 | changed Server is in dbprep and no servers running messages to debug 2. Removed the use of grep to find exited server logs. changed the use of numservers to select between 1 to numservers. check-in: 3da36b7bfb user: mmgraham tags: v1.65, v1.6586 | |
|
2021-05-24
| ||
| 16:46 | Changed version to v1.6586 check-in: cb6232575a user: mmgraham tags: v1.65 | |
Changes
Modified server.scm from [15bbdd7b10] to [9aa343c195].
| ︙ | ︙ | |||
200 201 202 203 204 205 206 |
(list (car dat) ;; host
(string->number (cadr dat)) ;; port
(string->number (caddr dat))
(cadr (cddr dat))))))
(begin
(if dbprep-found
(begin
| | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 |
(list (car dat) ;; host
(string->number (cadr dat)) ;; port
(string->number (caddr dat))
(cadr (cddr dat))))))
(begin
(if dbprep-found
(begin
(debug:print-info 2 *default-log-port* "Server is in dbprep at " (common:human-time))
(thread-sleep! 0.5) ;; was 25 sec but that blocked things from starting?
)
(debug:print-info 0 *default-log-port* "Unable to get server info from " logf " at " (seconds->time-string (current-seconds)))
)
(list #f #f #f #f)))))))))
;; get a list of servers from the log files, with all relevant data
|
| ︙ | ︙ | |||
227 228 229 230 231 232 233 | (condition-case (create-directory (conc areapath "/logs") #t) (exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs"))) (exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list. exn=" exn))) (directory-exists? (conc areapath "/logs"))) '())) | | > > | < | | 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 |
(condition-case
(create-directory (conc areapath "/logs") #t)
(exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs")))
(exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list. exn=" exn)))
(directory-exists? (conc areapath "/logs")))
'()))
;; Get the list of server logs. First remove logs for servers that have exited.
(let* (
;; (exiting-servers (system (conc "bash -c 'rm -f `grep -il exiting " areapath "/logs/server-*-*.log 2> /dev/null`'")))
(server-logs (glob (conc areapath "/logs/server-*-*.log")))
(num-serv-logs (length server-logs)))
(if (or (null? server-logs) (= num-serv-logs 0))
(let ()
(debug:print 2 *default-log-port* "There are no servers running at " (common:human-time))
'()
)
(let loop ((hed (string-chomp (car server-logs)))
(tal (cdr server-logs))
(res '()))
(let* ((mod-time (handle-exceptions
exn
|
| ︙ | ︙ | |||
458 459 460 461 462 463 464 |
(define (server:check-if-running areapath) ;; #!key (numservers "2"))
(let* ((ns (server:get-num-servers))
(servers (server:get-best (server:get-list areapath))))
(if (or (and servers
(null? servers))
(not servers)
(and (list? servers)
| | | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 |
(define (server:check-if-running areapath) ;; #!key (numservers "2"))
(let* ((ns (server:get-num-servers))
(servers (server:get-best (server:get-list areapath))))
(if (or (and servers
(null? servers))
(not servers)
(and (list? servers)
(< (length servers) (+ 1 (random ns))))) ;; somewhere between 1 and numservers
#f
(let loop ((hed (car servers))
(tal (cdr servers)))
(let ((res (server:check-server hed)))
(if res
hed
(if (null? tal)
|
| ︙ | ︙ |