Revert "switch subprocess output to logger"

This reverts commit d4860c8aed.
This commit is contained in:
Kiara Grouwstra 2025-04-12 14:36:25 +02:00
parent 60093212d7
commit 45c53ec150
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 2 additions and 12 deletions

View file

@ -223,10 +223,6 @@ LOGGING = {
}, },
} }
SECONDS_PER_MINUTE = 60
DEPLOY_TIMEOUT_MINUTES = 25
DEPLOY_TIMEOUT_SECONDS = DEPLOY_TIMEOUT_MINUTES * SECONDS_PER_MINUTE
# Customization via user settings # Customization via user settings
# This must be at the end, as it must be able to override the above # This must be at the end, as it must be able to override the above
# TODO(@fricklerhandwerk): # TODO(@fricklerhandwerk):

View file

@ -1,7 +1,6 @@
from enum import Enum from enum import Enum
import json import json
from os.path import expanduser from os.path import expanduser
from subprocess import Popen, PIPE, STDOUT
import subprocess import subprocess
import logging import logging
import os import os
@ -161,11 +160,6 @@ class DeploymentStatus(ConfigurationForm):
"--auto-approve", "--auto-approve",
"-lock=false", "-lock=false",
] ]
popen = Popen(cmd, cwd=cwd, env=env, stdout=PIPE, stderr=STDOUT) deployment_result = subprocess.run(cmd, cwd=cwd, env=env)
with popen.stdout: logging.info(deployment_result)
for line in iter(popen.stdout.readline, b''):
logger.info(line.decode('utf-8').strip())
# FIXME catch subprocess.TimeoutExpired
deployment_result = popen.wait(timeout=settings.DEPLOY_TIMEOUT_SECONDS)
logger.info(f"deployment_result: {deployment_result}")
return deployment_result, deployment_params return deployment_result, deployment_params