aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2015-04-17 17:41:16 +0200
committerMilo Casagrande <milo.casagrande@linaro.org>2015-04-17 17:41:16 +0200
commit848e66e5d996290ab28a145500db416115e0a3d3 (patch)
tree9126f136a8b1bf9d72a8ae73ca21019244b732d3
parent709df35eccb2168b92bb3c632f85ee122959d8a5 (diff)
Search for parsed logs and add it to the template.
* Switch to use l10n domain defined in common module.
-rw-r--r--app/utils/report/build.py25
1 files changed, 14 insertions, 11 deletions
diff --git a/app/utils/report/build.py b/app/utils/report/build.py
index 1a0583d..e0220e2 100644
--- a/app/utils/report/build.py
+++ b/app/utils/report/build.py
@@ -13,22 +13,16 @@
"""Create the build email report."""
-import gettext
import pymongo
import models
import utils.db
import utils.report.common as rcommon
-# Register the translation domain and fallback safely, at the moment we do
-# not care if we have translations or not, we just use gettext to exploit its
-# plural forms capabilities. We mark the email string as translatable though
-# so we might give that feature in the future.
-L10N = gettext.translation(models.I18N_DOMAIN, fallback=True)
# Register normal Unicode gettext.
-G_ = L10N.ugettext
+G_ = rcommon.L10N.ugettext
# Register plural forms Unicode gettext.
-P_ = L10N.ungettext
+P_ = rcommon.L10N.ungettext
BUILD_SEARCH_FIELDS = [
@@ -130,7 +124,7 @@ def create_build_report(job,
failed_data = _parse_build_data(fail_results.clone())
- summary_spec = {
+ errors_spec = {
models.JOB_KEY: job,
models.KERNEL_KEY: kernel
}
@@ -139,17 +133,26 @@ def create_build_report(job,
]
errors_summary = utils.db.find_one2(
database[models.ERRORS_SUMMARY_COLLECTION],
- summary_spec,
+ errors_spec,
summary_fields
)
+ error_details = utils.db.find(
+ database[models.ERROR_LOGS_COLLECTION],
+ 0,
+ 0,
+ spec=errors_spec,
+ sort=[(models.DEFCONFIG_FULL_KEY, 1)]
+ )
+
kwargs = {
"base_url": rcommon.DEFAULT_BASE_URL,
"build_url": rcommon.DEFAULT_BUILD_URL,
"email_format": email_format,
- "errors_summary": errors_summary,
"error_data": err_data,
+ "error_details": error_details,
"errors_count": errors_count,
+ "errors_summary": errors_summary,
"fail_count": fail_count,
"failed_data": failed_data,
"git_branch": git_branch,