From fb7fcd9242f4a5711ad74ea0fd01b9636bc00601 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Fri, 21 May 2021 18:49:14 +0200
Subject: [PATCH] improved logging

---
 master.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/master.py b/master.py
index 2c1e66b..8c58a1d 100644
--- a/master.py
+++ b/master.py
@@ -14,6 +14,7 @@ import time
 from multiprocessing import Pool, Queue, current_process, Lock
 
 import yaml
+from humanfriendly import format_timespan
 from packaging import version
 
 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(
              repo.split("-")[1:]) + ".conf"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     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
         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,
                                stderr=subprocess.STDOUT)
         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()
             return
 
     # copying
     pkgs.extend(glob.glob("*.pkg.tar.zst.sig"))
     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"] + "/"))
         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)
     logging.debug("[REPO-ADD] %s", r_res.stdout.decode())
     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()
         build_cleanup()
         return
@@ -100,13 +101,14 @@ def build(pkgbuild, repo):
     logging.debug("[PACCACHE] %s", p_res.stdout.decode())
     repo_lock.release()
     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()
         return
 
     # 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: