提交 419737c0 编写于 作者: C Cleber Rosa

Job: give warning on both the UI and LOG

The recently introduced feature on job category would produce warnings
that wouldn't be visible in the logs because the log initialization is
done later (requires a log directory to be defined).

Let's create the category after the log has been sucessfully
initialized, and while at it, also show the warning in the UI.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 75574fa6
...@@ -167,6 +167,7 @@ class Job: ...@@ -167,6 +167,7 @@ class Job:
self._setup_job_results() self._setup_job_results()
self.result = result.Result(self) self.result = result.Result(self)
self.__start_job_logging() self.__start_job_logging()
self._setup_job_category()
# Use "logdir" in case "keep_tmp" is enabled # Use "logdir" in case "keep_tmp" is enabled
if getattr(self.args, "keep_tmp", None) == "on": if getattr(self.args, "keep_tmp", None) == "on":
base_tmpdir = self.logdir base_tmpdir = self.logdir
...@@ -204,8 +205,6 @@ class Job: ...@@ -204,8 +205,6 @@ class Job:
id_file_obj.flush() id_file_obj.flush()
os.fsync(id_file_obj) os.fsync(id_file_obj)
self._setup_job_category()
def _setup_job_category(self): def _setup_job_category(self):
""" """
This has to be called after self.logdir has been defined This has to be called after self.logdir has been defined
...@@ -222,8 +221,10 @@ class Job: ...@@ -222,8 +221,10 @@ class Job:
return return
if category != astring.string_to_safe_path(category): if category != astring.string_to_safe_path(category):
LOG_JOB.warning("Unable to set category in job results: name is not " msg = ("Unable to set category in job results: name is not "
"filesystem safe: %s", category) "filesystem safe: %s" % category)
LOG_UI.warning(msg)
LOG_JOB.warning(msg)
return return
# we could also get "base_logdir" from args, but I believe this is # we could also get "base_logdir" from args, but I believe this is
...@@ -240,7 +241,9 @@ class Job: ...@@ -240,7 +241,9 @@ class Job:
os.symlink(os.path.relpath(self.logdir, category_path), os.symlink(os.path.relpath(self.logdir, category_path),
os.path.join(category_path, os.path.basename(self.logdir))) os.path.join(category_path, os.path.basename(self.logdir)))
except Exception: except Exception:
LOG_JOB.warning("Unable link this job to category %s", category) msg = "Unable to link this job to category %s" % category
LOG_UI.warning(msg)
LOG_JOB.warning(msg)
def __start_job_logging(self): def __start_job_logging(self):
# Enable test logger # Enable test logger
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册