@amsterdamdatalabs/adl-agent-control-darwin-arm64 0.1.67 → 0.1.68
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/adl +1 -1
- package/bin/job-watchdog +2 -1
- package/bin/setup +7 -2
- package/package.json +1 -1
package/bin/adl
CHANGED
package/bin/job-watchdog
CHANGED
|
@@ -39,6 +39,7 @@ fix_mode() {
|
|
|
39
39
|
fix_mode "$log_dir" 755
|
|
40
40
|
fix_mode "$log_dir/stdout.log" 644
|
|
41
41
|
fix_mode "$log_dir/stderr.log" 644
|
|
42
|
+
fix_mode "$log_dir/pool-reaper.log" 644
|
|
42
43
|
|
|
43
44
|
os="$(uname -s)"
|
|
44
45
|
cause=""
|
|
@@ -60,7 +61,7 @@ if [ "$os" = Darwin ] && [ -f "$root/Library/LaunchDaemons/$reaper_label.plist"
|
|
|
60
61
|
if reaper_printed="$(launchctl print "system/$reaper_label" 2>&1)"; then
|
|
61
62
|
reaper_exit="$(printf '%s\n' "$reaper_printed" | sed -n 's/^[[:space:]]*last exit code = \([0-9][0-9]*\).*/\1/p' | head -n 1)"
|
|
62
63
|
if [ -n "$reaper_exit" ] && [ "$reaper_exit" != 0 ]; then
|
|
63
|
-
log "WARN watchdog: $reaper_label last run failed (exit $reaper_exit); the Hetzner dead-man switch may not be reaping: see /var/log/adl/
|
|
64
|
+
log "WARN watchdog: $reaper_label last run failed (exit $reaper_exit); the Hetzner dead-man switch may not be reaping: see /var/log/adl/pool-reaper.log"
|
|
64
65
|
else
|
|
65
66
|
log "INFO watchdog: $reaper_label is loaded"
|
|
66
67
|
fi
|
package/bin/setup
CHANGED
|
@@ -306,6 +306,11 @@ case "$fleet_host_platform" in
|
|
|
306
306
|
exit 1
|
|
307
307
|
}
|
|
308
308
|
reaper_path="$(adl_owner_path "$os_name" "$owner_home")" || exit 1
|
|
309
|
+
# launchd opens StandardOutPath as UserName: the root-owned fleet logs would fail the spawn (EX_CONFIG).
|
|
310
|
+
reaper_log="$system_root/var/log/adl/pool-reaper.log"
|
|
311
|
+
touch "$reaper_log"
|
|
312
|
+
chown "$owner:$log_group" "$reaper_log"
|
|
313
|
+
chmod 0644 "$reaper_log"
|
|
309
314
|
{
|
|
310
315
|
printf '%s\n' '<?xml version="1.0" encoding="UTF-8"?>'
|
|
311
316
|
printf '%s\n' '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
|
|
@@ -322,8 +327,8 @@ case "$fleet_host_platform" in
|
|
|
322
327
|
printf '<key>StartInterval</key><integer>%s</integer>\n' "$((reaper_minutes * 60))"
|
|
323
328
|
printf '%s\n' '<key>RunAtLoad</key><true/>'
|
|
324
329
|
printf '%s\n' '<key>ProcessType</key><string>Background</string>'
|
|
325
|
-
printf '%s\n' '<key>StandardOutPath</key><string>/var/log/adl/
|
|
326
|
-
printf '%s\n' '<key>StandardErrorPath</key><string>/var/log/adl/
|
|
330
|
+
printf '%s\n' '<key>StandardOutPath</key><string>/var/log/adl/pool-reaper.log</string>'
|
|
331
|
+
printf '%s\n' '<key>StandardErrorPath</key><string>/var/log/adl/pool-reaper.log</string>'
|
|
327
332
|
printf '%s\n' '</dict></plist>'
|
|
328
333
|
} >"$reaper_plist"
|
|
329
334
|
chown root:wheel "$reaper_plist"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amsterdamdatalabs/adl-agent-control-darwin-arm64",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.68",
|
|
4
4
|
"description": "adl CLI binary for darwin/arm64 (agent identity + Azure DevOps front door — see docs/architecture/cli-design.md)",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"os": [
|