From d0d23416d62064b0a6336eabe0ff00c61de5b15a Mon Sep 17 00:00:00 2001
From: Benedikt Ziemons <ben@rs485.network>
Date: Sat, 23 Mar 2024 16:37:47 +0100
Subject: [PATCH] Fix backwards incompatibilities with sh 2.0

also set the pod checker alarm to every 2 minutes.
ZFS really doesn't like it more often.
---
 .idea/misc.xml   |  3 +++
 main.py          | 10 ++++------
 requirements.txt |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3ea7c1c..90b1042 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Black">
+    <option name="sdkName" value="Python 3.11" />
+  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
diff --git a/main.py b/main.py
index afbdba0..80b72a3 100644
--- a/main.py
+++ b/main.py
@@ -11,12 +11,10 @@ from signal import signal, SIGHUP, SIGINT, SIGTERM, setitimer, SIGALRM, ITIMER_R
 
 import click
 import sh
-from sh import podman
 
 SERVICES_BASE_PATH = "/infra/services/"
 
-# noinspection PyCallingNonCallable
-shlog = sh(_out=sys.stdout, _err=sys.stderr)
+shlog = sh.bake(_out=sys.stdout, _err=sys.stderr)
 sdnotify = sh.Command("systemd-notify")
 
 
@@ -68,7 +66,7 @@ class PodKeeper:
 
     def run(self):
         os.chdir(self.podhome)
-        if self.replace and podman.pod.exists(self.podname, _ok_code=[0, 1]).exit_code == 0:
+        if self.replace and sh.podman.pod.exists(self.podname, _ok_code=[0, 1], _return_cmd=True).exit_code == 0:
             print(f"Replacing existing pod {self.podname}", file=sys.stderr, flush=True)
             shlog.podman.pod.stop(self.podname)
             shlog.podman.pod.rm("-f", self.podname)
@@ -118,7 +116,7 @@ class PodKeeper:
 
     def check_pod(self):
         new_timestamp = datetime.utcnow()
-        inspect_command = podman.pod.inspect(self.podname)
+        inspect_command = sh.podman.pod.inspect(self.podname, _return_cmd=True)
         pod_description = json.loads(inspect_command.stdout)
         for container in pod_description["Containers"]:
             if container["State"] != "running":
@@ -180,7 +178,7 @@ def main(network, log_driver, log_level, replace, remove, verbose, identifier):
     signal(SIGALRM, keeper.check)
     signal(SIGUSR1, keeper.passthrough)
     signal(SIGUSR2, keeper.passthrough)
-    setitimer(ITIMER_REAL, 4.0, 10.0)
+    setitimer(ITIMER_REAL, 4.0, 120.0)
 
     keeper.run()
 
diff --git a/requirements.txt b/requirements.txt
index 9c95504..623c886 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 click~=8.1.7
-sh~=1.14.3
+sh~=2.0.6