hub: Rename logfile variable to not clash with the logger

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 547386c2755ff74e4ff26bbc3dd2e88a7d6cf3d4..dbea5f2c00a1544556781b78e2ee780af31ec007 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -266,7 +266,7 @@ class Job(base.DataObject):
                # Store the time
                self._set_attribute_now("started_at")
 
-       async def finished(self, success, packages=None, message=None, log=None):
+       async def finished(self, success, packages=None, message=None, logfile=None):
                """
                        Called when this job has finished
                """
@@ -274,8 +274,8 @@ class Job(base.DataObject):
                self._set_attribute_now("finished_at")
 
                # Import log
-               if log:
-                       await self._import_log(log)
+               if logfile:
+                       await self._import_logfile(logfile)
 
                # Import packages
                if success and packages:
@@ -291,12 +291,12 @@ class Job(base.DataObject):
 
                        # Notify the owner
                        if self.build.owner:
-                               # Tail the log
-                               log = await self.tail_log(100)
-
                                # Send an email
                                self.build.owner.send_email(
-                                       "jobs/messages/failed.txt", job=self, build=self.build, log=log,
+                                       "jobs/messages/failed.txt",
+                                       job=self,
+                                       build=self.build,
+                                       log=await self.tail_log(100),
                                )
 
                # Propagate any changes to the build
@@ -467,7 +467,7 @@ class Job(base.DataObject):
                # Return all lines
                return q
 
-       async def _import_log(self, upload):
+       async def _import_logfile(self, upload):
                # Create some destination path
                path = self.backend.path(
                        "logs",

diff --git a/src/hub/jobs.py b/src/hub/jobs.py
index cd82ec3e11244976c75d6519891c29ac96dc57e2..d9cdca37a7e33a26943c8dbeb73b157cda4970b8 100644 (file)
--- a/src/hub/jobs.py
+++ b/src/hub/jobs.py
@@ -92,11 +92,11 @@ class FinishedHandler(BaseHandler):
                success = self.get_argument_bool("success")
 
                # Fetch the log
-               log = self.get_argument_upload("log")
+               logfile = self.get_argument_upload("log")
 
                with self.db.transaction():
                        # Mark the job as finished
-                       await job.finished(success=success, log=log)
+                       await job.finished(success=success, logfile=logfile)
 
-                       # Delete the log
-                       await log.delete()
+                       # Delete the logfile
+                       await logfile.delete()