Compare commits

..

2 Commits

Author SHA1 Message Date
5891409fdb print real time
All checks were successful
Python package / lint (push) Successful in 6s
Publish Python 🐍 distribution 📦 to PyPI and TestPyPI / Build distribution 📦 (push) Successful in 8s
Publish Python 🐍 distribution 📦 to PyPI and TestPyPI / Publish Python 🐍 distribution 📦 to PyPI (push) Successful in 5s
Publish Python 🐍 distribution 📦 to PyPI and TestPyPI / Publish Python 🐍 distribution 📦 to TestPyPI (push) Successful in 5s
2024-09-14 18:32:39 -06:00
0e9eba4900 add dry-run 2024-09-14 17:59:49 -06:00

View File

@ -34,7 +34,13 @@ from goat_monitor._version import __version__ # type: ignore
default=False, default=False,
help="Print version and exit", help="Print version and exit",
) )
def wrap(command: List[str], config: Path, retries: int, version): @click.option(
"--dry-run",
is_flag=True,
default=False,
help="Run command without sending any notifications",
)
def wrap(command: List[str], config: Path, retries: int, version: bool, dry_run: bool):
"""Wrap an arbitrary command with gotify notifications""" """Wrap an arbitrary command with gotify notifications"""
if version: if version:
@ -46,13 +52,14 @@ def wrap(command: List[str], config: Path, retries: int, version):
settings = toml.load(f) settings = toml.load(f)
# gotify configuration # gotify configuration
url = settings["server"] if not dry_run:
app_token = settings["app_token"] url = settings["server"]
with gotify.Gotify(base_url=url, app_token=app_token) as gotify_connection: app_token = settings["app_token"]
# this is just to test configuration. with gotify.Gotify(base_url=url, app_token=app_token) as gotify_connection:
# I don't know how long a gotify connection will stay up so rather than thinking about it # this is just to test configuration.
# I'm just creating a new one whenever I need to send a message # I don't know how long a gotify connection will stay up so rather than thinking about it
pass # I'm just creating a new one whenever I need to send a message
pass
if retries == -1: if retries == -1:
retries = np.inf retries = np.inf
@ -62,20 +69,25 @@ def wrap(command: List[str], config: Path, retries: int, version):
attempt = 0 attempt = 0
while attempt <= retries: while attempt <= retries:
# run the command # run the command
result = subprocess.run( with subprocess.Popen(
" ".join(command), " ".join(command),
shell=True, shell=True,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
encoding="utf-8", ) as proc:
) stdout = ""
while True:
c = proc.stdout.read(1)
if c == b"":
break
s = c.decode("utf-8")
stdout += s
print(s, end="", flush=True)
return_code = proc.wait()
# TODO: print lines real time as the subprocess runs if return_code:
print(result.stdout, end="")
if result.returncode:
# failed # failed
title = f"Command failed with exit code {result.returncode}" title = f"Command failed with exit code {return_code}"
if attempt < retries: if attempt < retries:
title += f" - Retrying (attempt {attempt+1}/{retries})" title += f" - Retrying (attempt {attempt+1}/{retries})"
else: else:
@ -85,7 +97,7 @@ def wrap(command: List[str], config: Path, retries: int, version):
title = "Command succeeded" title = "Command succeeded"
MAX_LINES = 20 MAX_LINES = 20
lines = result.stdout.splitlines() lines = stdout.splitlines()
if len(lines) > MAX_LINES: if len(lines) > MAX_LINES:
lines = lines[-MAX_LINES:] lines = lines[-MAX_LINES:]
message = ( message = (
@ -95,16 +107,17 @@ def wrap(command: List[str], config: Path, retries: int, version):
+ "\n".join(lines) + "\n".join(lines)
) )
with gotify.Gotify(base_url=url, app_token=app_token) as gotify_connection: if not dry_run:
gotify_connection.create_message(message=message, title=title) with gotify.Gotify(base_url=url, app_token=app_token) as gotify_connection:
gotify_connection.create_message(message=message, title=title)
if not result.returncode: if not return_code:
# only retry on failure # only retry on failure
break break
attempt += 1 attempt += 1
sys.exit(result.returncode) sys.exit(return_code)
# %% main # %% main