|
108 | 108 | # We have to force it to be a notify service, in order to use systemd-notify. |
109 | 109 | serviceConfig.Type = lib.mkForce "notify"; |
110 | 110 | # If the TimeoutStartSec is not infinity, it can cause the service to fail, because the readiness probe is considered part of the startup. |
111 | | - serviceConfig.TimeoutStartSec = lib.mkForce "infinity"; |
| 111 | + serviceConfig.TimeoutStartSec = lib.mkForce "5"; |
112 | 112 |
|
113 | 113 | # We add a ExecStartPost with a script that runs the readiness probe |
114 | | - serviceConfig.ExecStartPost = |
| 114 | + serviceConfig.ExecStartPre = |
115 | 115 | let |
116 | 116 | scriptPath = lib.makeBinPath ( |
117 | 117 | [ |
|
128 | 128 | set -o nounset |
129 | 129 | export PATH="${scriptPath}:$PATH" |
130 | 130 |
|
131 | | - echo "Health check: starting background readiness probe for ${mainServiceName}." |
| 131 | + echo "Health check: starting background readiness probe for ${mainServiceName}." 1>>/tmp/banica1 2>>/tmp/banica2 |
132 | 132 | sleep ${toString probeCfg.initialDelay} |
133 | 133 | retryCount=${toString probeCfg.retryCount} |
134 | 134 | while true; do |
135 | 135 | if (timeout ${toString probeCfg.timeout}s ${probeCfg.command} &> /dev/null); then |
136 | | - echo "Health check: probe successful. Notifying systemd that the service is ready." |
137 | | - systemd-notify --ready --status="${probeCfg.statusReadyMessage}" |
| 136 | + echo "Health check: probe successful. Notifying systemd that the service is ready." 1>>/tmp/banica1 2>>/tmp/banica2 |
| 137 | + systemd-notify --ready --status="${probeCfg.statusReadyMessage}" 1>>/tmp/banica1 2>>/tmp/banica2 |
138 | 138 | exit 0 |
139 | 139 | else |
140 | | - echo "Health check: probe not successful. Notifying systemd that the service is still waiting. Retrying in ${toString probeCfg.interval} seconds..." |
141 | | - systemd-notify --status="${probeCfg.statusWaitingMessage}" |
| 140 | + echo "Health check: probe not successful. Notifying systemd that the service is still waiting. Retrying in ${toString probeCfg.interval} seconds..." 1>>/tmp/banica1 2>>/tmp/banica2 |
| 141 | + systemd-notify --status="${probeCfg.statusWaitingMessage}" 1>>/tmp/banica1 2>>/tmp/banica2 |
142 | 142 | if [[ ''${retryCount} -ne -1 ]]; then |
143 | 143 | retryCount=$((retryCount - 1)) |
144 | 144 | if [[ ''${retryCount} -le 0 ]]; then |
145 | | - echo "Health check: probe failed after maximum retries. Exiting." |
| 145 | + echo "Health check: probe failed after maximum retries. Exiting." 1>>/tmp/banica1 2>>/tmp/banica2 |
146 | 146 | exit 1 |
147 | 147 | fi |
148 | 148 | fi |
|
0 commit comments