remove use of _G.repo by sending all reports back to master process

Author: lilydjwg

lilac2/api.py

@@ -426,8 +426,7 @@ def update_aur_repo() -> None:
     _update_aur_repo_real(pkgbase)
   except Exception as e:
     l10n = intl.get_l10n('mail')
-    _G.repo.send_error_report(
-      _G.mod,
+    _G.add_report(
       exc = e,
       subject = l10n.format_value('aur-submit-error'),
     )

lilac2/building.py

@@ -13,7 +13,7 @@
 import signal
 from contextlib import suppress
 
-from .typing import LilacInfo, Cmd, RUsage, PkgToBuild, OnBuildVers
+from .typing import LilacInfo, Cmd, RUsage, PkgToBuild, OnBuildVers, Report
 from .nvchecker import NvResults
 from .packages import Dependency, get_built_package_files
 from .tools import reap_zombies
@@ -255,13 +255,15 @@ def call_worker(
   elif st == 'skipped':
     error = SkipBuild(r['msg'])
   elif st == 'failed':
-    if report := r.get('report'):
-      repo.send_error_report(
-        lilacinfo,
-        subject = report['subject'],
-        msg = report['msg'],
-        logfile = logfile,
-      )
+    if reports := r.get('reports'):
+      for r in reports:
+        report = Report(**r)
+        repo.send_error_report(
+          lilacinfo,
+          subject = report.subject,
+          msg = report.msg,
+          logfile = logfile if report.sendlog else None,
+        )
     error = BuildFailed(r['msg'])
   else:
     error = RuntimeError('unknown status from worker', st)

lilac2/typing.py

@@ -120,3 +120,9 @@ class PkgToBuild:
   pkgbase: str
   on_build_vers: OnBuildVers = dataclasses.field(default_factory=list)
   workerman: Optional[WorkerManager] = None
+
+@dataclasses.dataclass
+class Report:
+  subject: str
+  msg: str
+  sendlog: bool = True

lilac2/worker.py

@@ -11,14 +11,16 @@
 from pathlib import Path
 import platform
 import traceback
+from functools import partial
+import dataclasses
 
 import pyalpm
 
 from .vendor.nicelogger import enable_pretty_logging
 from .vendor.myutils import file_lock
 
 from . import pkgbuild
-from .typing import LilacMod, Cmd, OnBuildVers
+from .typing import LilacMod, Cmd, OnBuildVers, Report
 from .cmd import run_cmd, UNTRUSTED_PREFIX
 from .api import (
   vcs_update, get_pkgver_and_pkgrel, update_pkgrel,
@@ -219,6 +221,8 @@ def main() -> None:
 
   _G.commit_msg_template = input['commit_msg_template']
   _G.reponame = input['reponame']
+  reports: list[Report] = []
+  _G.add_report = partial(add_report, reports)
 
   r: dict[str, Any]
   try:
@@ -245,7 +249,8 @@ def main() -> None:
       'msg': repr(e),
     }
     sys.stdout.flush()
-    r['report'] = gen_failure_report(e)
+    logger.error('build failed', exc_info=e)
+    reports.append(gen_failure_report(e))
   except KeyboardInterrupt:
     logger.info('KeyboardInterrupt received')
     r = {
@@ -257,33 +262,31 @@ def main() -> None:
     kill_child_processes()
 
   r['version'] = getattr(_G, 'built_version', None)
+  r['reports'] = [dataclasses.asdict(r) for r in reports]
 
   with open(input['result'], 'w') as f:
     json.dump(r, f)
 
-def gen_failure_report(e: Exception) -> dict[str, str]:
-  logger.error('build failed', exc_info=e)
+def gen_failure_report(e: Exception) -> Report:
   l10n = intl.get_l10n('mail')
 
-  report = {}
-
   if isinstance(e, pkgbuild.ConflictWithOfficialError):
     reason = ''
     if e.groups:
       reason += l10n.format_value('package-in-official-group', {'groups': repr(e.groups)}) + '\n'
     if e.packages:
       reason += l10n.format_value('package-replacing-official-package', {'packages': repr(e.packages)}) + '\n'
     subj = l10n.format_value('package-conflicts-with-official-repos')
-    report['subject'] = subj
-    report['msg'] = reason,
+    report = Report(subject=subj, msg=reason)
 
   elif isinstance(e, pkgbuild.DowngradingError):
-    report['subject'] = l10n.format_value('package-older-subject')
-    report['msg'] = l10n.format_value('package-older-body', {
+    subj = l10n.format_value('package-older-subject')
+    msg = l10n.format_value('package-older-body', {
       'pkg': e.pkgname,
       'built_version': e.built_version,
       'repo_version': e.repo_version,
     }) + '\n'
+    report = Report(subject=subj, msg=msg)
 
   else:
     msgs = []
@@ -310,10 +313,19 @@ def gen_failure_report(e: Exception) -> dict[str, str]:
       subject = l10n.format_value('packaging-error-unknown-subject')
       msg1 = l10n.format_value('packaging-error-unknown')
       msgs.append(msg1 + '\n\n' + tb)
-    report['subject'] = subject
-    report['msg'] = '\n'.join(msgs)
+    report = Report(subject=subject, msg='\n'.join(msgs))
 
   return report
 
+def add_report(
+  reports: list[Report],
+  exc: Exception,
+  subject: str,
+) -> None:
+  report = gen_failure_report(exc)
+  report.subject = subject
+  report.sendlog = False
+  reports.append(report)
+
 if __name__ == '__main__':
   main()