Merge branch 'reduce-salt-calls'

TheCacophonyProject · Oct 16, 2024 · 073d848 · 073d848
2 parents e343cb9 + 0e7e1dc
commit 073d848
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/_release/tc2-hat-attiny.service b/_release/tc2-hat-attiny.service
@@ -2,6 +2,7 @@
 [Unit]
 Description=Cacophony Project ATtiny controller
 After=multi-user.target
+ConditionPathExists=/etc/salt/minion_id
 
 [Service]
 Type=simple

diff --git a/cmd/tc2-hat-attiny/main.go b/cmd/tc2-hat-attiny/main.go
@@ -159,11 +159,6 @@ func runMain() error {
 			onReason = fmt.Sprintf("Staying on because camera has been requested to stay on for %s", durToStr(waitDuration))
 		}
 
-		if waitDuration < saltCommandWaitDuration && shouldStayOnForSalt() {
-			waitDuration = saltCommandWaitDuration
-			onReason = "Staying on because salt command is running"
-		}
-
 		// Check if the RP2040 wants the RPi to stay on
 		if waitDuration <= time.Duration(0) {
 			val, err := attiny.readRegister(rp2040PiPowerCtrlReg)
@@ -176,6 +171,12 @@ func runMain() error {
 			}
 		}
 
+		// Checking if a salt command is running should only be done if needed
+		if waitDuration < time.Duration(0) && shouldStayOnForSalt() {
+			waitDuration = saltCommandWaitDuration
+			onReason = "Staying on because salt command is running"
+		}
+
 		if waitDuration <= time.Duration(0) {
 			stayOnLock.Lock()
 			for process, maxTime := range stayOnForProcess {