anonfunc/alhp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved logging

Browse Source
This commit is contained in:
Giovanni Harting
2021-05-21 18:49:14 +02:00
parent ba31a9a135
commit fb7fcd9242
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
master.py
View File

@@ -14,6 +14,7 @@ import time
from multiprocessing import Pool, Queue, current_process, Lock from multiprocessing import Pool, Queue, current_process, Lock
import yaml import yaml
from humanfriendly import format_timespan
from packaging import version from packaging import version
regex_pkgver = re.compile(r"^_?pkgver\s*=\s*(.+)$", re.MULTILINE) regex_pkgver = re.compile(r"^_?pkgver\s*=\s*(.+)$", re.MULTILINE)
@@ -48,7 +49,7 @@ def build(pkgbuild, repo):
os.path.join(config["basedir"]["makepkg"]) + "makepkg-" + '-'.join( os.path.join(config["basedir"]["makepkg"]) + "makepkg-" + '-'.join(
repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
if res.returncode: if res.returncode:
logging.warning("[%s/%s] Build failed. Check repo/logs for more information.", repo, name) logging.warning("[%s/%s/%s] Build failed. Check repo/logs for more information.", process_name, repo, name)
# write packagename to failed list # write packagename to failed list
with open(os.path.join(config["basedir"]["repo"], repo + "_failed.txt"), "a") as f: with open(os.path.join(config["basedir"]["repo"], repo + "_failed.txt"), "a") as f:
@@ -70,14 +71,14 @@ def build(pkgbuild, repo):
s_res = subprocess.run(["gpg", "--batch", "--detach-sign", pkg], stdout=subprocess.PIPE, s_res = subprocess.run(["gpg", "--batch", "--detach-sign", pkg], stdout=subprocess.PIPE,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
if s_res.returncode: if s_res.returncode:
logging.error("[%s/%s] Signing failed: %s", repo, name, s_res.stdout.decode()) logging.error("[%s/%s/%s] Signing failed: %s", process_name, repo, name, s_res.stdout.decode())
build_cleanup() build_cleanup()
return return
# copying # copying
pkgs.extend(glob.glob("*.pkg.tar.zst.sig")) pkgs.extend(glob.glob("*.pkg.tar.zst.sig"))
for pkg in pkgs: for pkg in pkgs:
logging.debug("[%s/%s] Copy %s to %s", repo, name, pkg, logging.debug("[%s/%s/%s] Copy %s to %s", process_name, repo, name, pkg,
os.path.join(config["basedir"]["repo"], repo, "os", config["arch"] + "/")) os.path.join(config["basedir"]["repo"], repo, "os", config["arch"] + "/"))
shutil.copy2(pkg, os.path.join(config["basedir"]["repo"], repo, "os", config["arch"] + "/")) shutil.copy2(pkg, os.path.join(config["basedir"]["repo"], repo, "os", config["arch"] + "/"))
@@ -89,7 +90,7 @@ def build(pkgbuild, repo):
pkgs[0]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) pkgs[0]], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
logging.debug("[REPO-ADD] %s", r_res.stdout.decode()) logging.debug("[REPO-ADD] %s", r_res.stdout.decode())
if r_res.returncode: if r_res.returncode:
logging.error("[%s/%s] Repo action failed: %s", repo, name, r_res.stdout.decode()) logging.error("[%s/%s/%s] Repo action failed: %s", process_name, repo, name, r_res.stdout.decode())
repo_lock.release() repo_lock.release()
build_cleanup() build_cleanup()
return return
@@ -100,13 +101,14 @@ def build(pkgbuild, repo):
logging.debug("[PACCACHE] %s", p_res.stdout.decode()) logging.debug("[PACCACHE] %s", p_res.stdout.decode())
repo_lock.release() repo_lock.release()
if p_res.returncode: if p_res.returncode:
logging.error("[%s/%s] Repo cleanup failed: %s", repo, name, p_res.stdout.decode()) logging.error("[%s/%s/%s] Repo cleanup failed: %s", process_name, repo, name, p_res.stdout.decode())
build_cleanup() build_cleanup()
return return
# cleanup # cleanup
build_cleanup() build_cleanup()
logging.info("[%s/%s] Build successful (%ss)", repo, name, int(time.time() - start_time)) logging.info("[%s/%s/%s] Build successful (%s)", process_name, repo, name,
format_timespan(time.time() - start_time))
def run_worker() -> None: def run_worker() -> None: