Overview
| Comment: | Fixed nbfake variable handling - was causing log files disappearing |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 | v1.6005_ww44.5 |
| Files: | files | file ages | folders |
| SHA1: |
9926990b7a62402441bc973dea71bf66 |
| User & Date: | mrwellan on 2014-10-29 17:29:17 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-11-02
| ||
| 09:25 | Merged streamline exception handling branch into v1.60 check-in: 8fd7d261b7 user: matt tags: v1.60 | |
|
2014-11-01
| ||
| 07:01 | Streamline exception handling check-in: 2d5e0edb49 user: matt tags: streamline-exception-handling | |
|
2014-10-29
| ||
| 17:29 | Fixed nbfake variable handling - was causing log files disappearing check-in: 9926990b7a user: mrwellan tags: v1.60, v1.6005_ww44.5 | |
| 16:03 | Merged nbfake fix check-in: f050e1d721 user: mrwellan tags: v1.60, v1.6005_ww44.3 | |
Changes
Modified server.scm from [749eb4a6f5] to [faceda817c].
| ︙ | ︙ | |||
102 103 104 105 106 107 108 109 110 111 112 113 114 115 |
(not (string-match (conc "("curr-host "|" curr-host"\\..*)") target-host))
(not (equal? curr-ip target-host)))
(begin
(debug:print-info 0 "Starting server on " target-host ", logfile is " logfile)
(setenv "TARGETHOST" target-host)))
(setenv "TARGETHOST_LOGF" logfile)
(system (conc "nbfake " cmdln))
;; (system cmdln)
(pop-directory)))
;; kind start up of servers, wait 40 seconds before allowing another server for a given
;; run-id to be launched
(define (server:kind-run run-id)
(let ((last-run-time (hash-table-ref/default *server-kind-run* run-id #f)))
| > > | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
(not (string-match (conc "("curr-host "|" curr-host"\\..*)") target-host))
(not (equal? curr-ip target-host)))
(begin
(debug:print-info 0 "Starting server on " target-host ", logfile is " logfile)
(setenv "TARGETHOST" target-host)))
(setenv "TARGETHOST_LOGF" logfile)
(system (conc "nbfake " cmdln))
(unsetenv "TARGETHOST_LOGF")
(if (get-environment-variable "TARGETHOST")(unsetenv "TARGETHOST"))
;; (system cmdln)
(pop-directory)))
;; kind start up of servers, wait 40 seconds before allowing another server for a given
;; run-id to be launched
(define (server:kind-run run-id)
(let ((last-run-time (hash-table-ref/default *server-kind-run* run-id #f)))
|
| ︙ | ︙ |
Modified utils/nbfake from [5ee8863c91] to [9de79bbac2].
| ︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | # Can't always trust $PWD CURRWD=$(pwd) # Make sure nbfake host and logfile are set. Fall back to old-style variable names if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]]; then MY_NBFAKE_HOST=$TARGETHOST else MY_NBFAKE_HOST=$NBFAKE_HOST unset NBFAKE_HOST fi if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then MY_NBFAKE_LOG=$TARGETHOST_LOGF else MY_NBFAKE_LOG=$NBFAKE_LOG unset NBFAKE_LOG fi # Set default nbfake log | > > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | # Can't always trust $PWD CURRWD=$(pwd) # Make sure nbfake host and logfile are set. Fall back to old-style variable names if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]]; then MY_NBFAKE_HOST=$TARGETHOST unset TARGETHOST else MY_NBFAKE_HOST=$NBFAKE_HOST unset NBFAKE_HOST fi if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then MY_NBFAKE_LOG=$TARGETHOST_LOGF unset TARGETHOST_LOGF else MY_NBFAKE_LOG=$NBFAKE_LOG unset NBFAKE_LOG fi # Set default nbfake log |
| ︙ | ︙ |