Fix setup of python import

bulletmark · bulletmark · commit 6958d2432ed7 · 2023-12-23T08:46:16.000+10:00
This change means we can't specify unbuffered output to python so we also change the app code to always flush on output. Fixes issue #15.
diff --git a/sleep_inhibitor/sleep-inhibitor.service b/sleep_inhibitor/sleep-inhibitor.service
@@ -2,7 +2,7 @@
 Description=Sleep Inhibitor Service
 
 [Service]
-ExecStart=/usr/bin/python3 -u /usr/bin/%p
+ExecStart=/usr/bin/%p
 
 [Install]
 WantedBy=default.target
diff --git a/sleep_inhibitor/sleep_inhibitor.py b/sleep_inhibitor/sleep_inhibitor.py
@@ -1,4 +1,5 @@
-#!/usr/bin/python3 -u
+#!/usr/bin/python3
+
 'Program to run plugins to inhibit system sleep/suspend.'
 # Mark Blakeney, Jul 2020.
 
@@ -22,6 +23,9 @@
 
 TIMEMULTS = {'s': 1, 'm': 60, 'h': 3600}
 
+def log(msg):
+    print(msg, flush=True)
+
 def conv_to_secs(val):
     'Convert given time string to float seconds'
     # Default input time value (without qualifier) is minutes
@@ -91,7 +95,7 @@ def __init__(self, index, prog, progname, period, period_on,
         self.icmd = shlex.split(f'{inhibitor_prog}{what} --who="{progname}" '
                 f'--why="{self.name}" {prog} -s {period_on} -i "{cmd}"')
 
-        print(f'{self.name} [{path}] configured @ {period_str}/{period_on_str}')
+        log(f'{self.name} [{path}] configured @ {period_str}/{period_on_str}')
 
     async def run(self):
         'Worker function which runs as a asyncio task for each plugin'
@@ -102,16 +106,16 @@ async def run(self):
             while return_code == SUSP_CODE:
                 if self.is_inhibiting is not True:
                     self.is_inhibiting = True
-                    print(f'{self.name} is inhibiting '
-                          f'suspend (return={return_code})')
+                    log(f'{self.name} is inhibiting '
+                        f'suspend (return={return_code})')
 
                 proc = await asyncio.create_subprocess_exec(*self.icmd)
                 return_code = await proc.wait()
 
             if self.is_inhibiting is not False:
                 self.is_inhibiting = False
-                print(f'{self.name} is not inhibiting '
-                      f'suspend (return={return_code})')
+                log(f'{self.name} is not inhibiting '
+                    f'suspend (return={return_code})')
 
             await asyncio.sleep(self.period)
 
@@ -133,7 +137,7 @@ def init():
     base_dir = Path(__file__).resolve().parent
 
     if args.package_dir:
-        print(base_dir)
+        log(base_dir)
         sys.exit()
 
     # This instance may be a child invocation merely to run and check
@@ -165,7 +169,7 @@ def init():
             continue
 
         vers = res.stdout.split('\n')[0].strip()
-        print(f'{progname} using {iprog}, {vers}')
+        log(f'{progname} using {iprog}, {vers}')
         inhibitor_prog = iprog
 
     if not inhibitor_prog:
