You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/17 17:06:32 UTC
[airavata-django-portal] branch master updated (d6441a8 -> ca4f2c2)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from d6441a8 AIRAVATA-2990 Process level details added to ExperimentDetailsView
new ed7851c AIRAVATA-2638 Default logging config emails errors to admins
new ca4f2c2 AIRAVATA-2990 Fix missing reference
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../output-displays/DownloadOutputDisplay.vue | 12 ++++--
.../output-displays/OutputDisplayContainer.vue | 12 +++++-
django_airavata/settings.py | 27 ++++++++++++-
django_airavata/settings_local.py.sample | 46 +++++++++++-----------
4 files changed, 66 insertions(+), 31 deletions(-)
[airavata-django-portal] 01/02: AIRAVATA-2638 Default logging
config emails errors to admins
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit ed7851c70e8956a3cd42e9a0880a35b0f9bcaeb5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 17 13:05:24 2019 -0400
AIRAVATA-2638 Default logging config emails errors to admins
---
django_airavata/settings.py | 27 ++++++++++++++++++-
django_airavata/settings_local.py.sample | 46 +++++++++++++++-----------------
2 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/django_airavata/settings.py b/django_airavata/settings.py
index 5ac118a..0eb6907 100644
--- a/django_airavata/settings.py
+++ b/django_airavata/settings.py
@@ -258,16 +258,41 @@ WEBPACK_LOADER = webpack_loader_util.create_webpack_loader_config()
LOGGING = {
'version': 1,
+ 'disable_existing_loggers': False,
+ 'filters': {
+ 'require_debug_false': {
+ '()': 'django.utils.log.RequireDebugFalse',
+ },
+ 'require_debug_true': {
+ '()': 'django.utils.log.RequireDebugTrue',
+ },
+ },
+ 'formatters': {
+ 'verbose': {
+ 'format': '[%(asctime)s %(name)s:%(lineno)d %(levelname)s] %(message)s'
+ },
+ },
'handlers': {
'console': {
'class': 'logging.StreamHandler',
+ 'formatter': 'verbose'
},
+ 'mail_admins': {
+ 'filters': ['require_debug_false'],
+ 'level': 'ERROR',
+ 'class': 'django.utils.log.AdminEmailHandler',
+ 'include_html': True,
+ }
},
'loggers': {
'django_airavata': {
- 'handlers': ['console'],
+ 'handlers': ['console', 'mail_admins'],
'level': 'DEBUG' if DEBUG else 'INFO'
},
+ 'root': {
+ 'handlers': ['console', 'mail_admins'],
+ 'level': 'WARNING'
+ }
},
}
diff --git a/django_airavata/settings_local.py.sample b/django_airavata/settings_local.py.sample
index f67b18d..8f2d55e 100644
--- a/django_airavata/settings_local.py.sample
+++ b/django_airavata/settings_local.py.sample
@@ -77,45 +77,43 @@ SHARING_API_SECURE = False
# Portal settings
PORTAL_TITLE = 'Django Airavata Gateway'
-# Logging configuration
+# Logging configuration. Uncomment following to override default log configuration
# LOGGING = {
# 'version': 1,
# 'disable_existing_loggers': False,
-# 'formatters': {
-# 'verbose': {
-# 'format': '[%(asctime)s %(name)s:%(lineno)d %(levelname)s] %(message)s'
-# },
-# },
# 'filters': {
+# 'require_debug_false': {
+# '()': 'django.utils.log.RequireDebugFalse',
+# },
# 'require_debug_true': {
# '()': 'django.utils.log.RequireDebugTrue',
# },
# },
+# 'formatters': {
+# 'verbose': {
+# 'format': '[%(asctime)s %(name)s:%(lineno)d %(levelname)s] %(message)s'
+# },
+# },
# 'handlers': {
# 'console': {
-# 'filters': ['require_debug_true'],
# 'class': 'logging.StreamHandler',
-# 'formatter': 'verbose',
-# 'level': 'DEBUG',
-# },
-# 'file': {
-# 'class': 'logging.FileHandler',
-# 'filename': 'django_airavata.log',
-# 'formatter': 'verbose',
+# 'formatter': 'verbose'
# },
+# 'mail_admins': {
+# 'filters': ['require_debug_false'],
+# 'level': 'ERROR',
+# 'class': 'django.utils.log.AdminEmailHandler',
+# 'include_html': True,
+# }
# },
# 'loggers': {
-# 'django': {
-# 'handlers': ['console', 'file'],
-# 'level': os.getenv('DJANGO_LOG_LEVEL', 'INFO'),
-# },
-# 'airavata': {
-# 'handlers': ['console', 'file'],
-# 'level': 'DEBUG',
-# },
# 'django_airavata': {
-# 'handlers': ['console', 'file'],
-# 'level': 'DEBUG',
+# 'handlers': ['console', 'mail_admins'],
+# 'level': 'DEBUG' if DEBUG else 'INFO'
# },
+# 'root': {
+# 'handlers': ['console', 'mail_admins'],
+# 'level': 'WARNING'
+# }
# },
# }
[airavata-django-portal] 02/02: AIRAVATA-2990 Fix missing reference
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit ca4f2c2ccc093ea49d51eb5fe7b8c4ef628b7e17
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 17 13:06:12 2019 -0400
AIRAVATA-2990 Fix missing reference
---
.../experiment/output-displays/DownloadOutputDisplay.vue | 12 ++++++++----
.../experiment/output-displays/OutputDisplayContainer.vue | 12 ++++++++++--
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/DownloadOutputDisplay.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/DownloadOutputDisplay.vue
index 0234033..88b3106 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/DownloadOutputDisplay.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/DownloadOutputDisplay.vue
@@ -1,12 +1,16 @@
<template>
<div>
- <data-product-viewer v-for="dp in dataProducts"
- :data-product="dp" :key="dp.productUri"/>
+ <data-product-viewer
+ v-for="dp in dataProducts"
+ :data-product="dp"
+ :key="dp.productUri"
+ />
</div>
</template>
<script>
-import { models } from "django-airavata-api"
+import { models } from "django-airavata-api";
+import { components } from "django-airavata-common-ui";
export default {
name: "download-output-viewer",
@@ -26,7 +30,7 @@ export default {
components: {
"data-product-viewer": components.DataProductViewer
}
-}
+};
</script>
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
index ed8bbe0..550a19b 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
@@ -1,8 +1,15 @@
<template>
<b-card>
- <div slot="header" class="d-flex align-items-baseline">
+ <div
+ slot="header"
+ class="d-flex align-items-baseline"
+ >
<h6>{{ experimentOutput.name }}</h6>
- <b-dropdown v-if="showMenu" :text="currentView['provider-id']" class="ml-auto">
+ <b-dropdown
+ v-if="showMenu"
+ :text="currentView['provider-id']"
+ class="ml-auto"
+ >
<!-- TODO: add view label to data so that that can be used instead of id -->
<b-dropdown-item
v-for="view in outputViews"
@@ -22,6 +29,7 @@
<script>
import { models } from "django-airavata-api";
+import { components } from "django-airavata-common-ui";
import DownloadOutputDisplay from "./DownloadOutputDisplay";
import LinkDisplay from "./LinkDisplay";