From c0871b8f9cf63657ebf1e6df48451fb4adae3977 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 13 Jan 2017 09:09:38 +0530 Subject: [PATCH] Switch to oslo_log Trove dashboard is currently using python logging module to implement logging functionality. This patch made a switch to oslo.log(logging for openstack projects) Reference:- http://docs.openstack.org/developer/oslo.log Change-Id: I92a417a7342f4f264e8a5ede52ba49f0b7475e6d Closes-Bug: #1656167 --- requirements.txt | 1 + trove_dashboard/api/trove.py | 3 +-- .../content/database_backups/workflows/create_backup.py | 3 +-- trove_dashboard/content/database_clusters/forms.py | 2 +- trove_dashboard/content/database_clusters/tables.py | 3 +-- trove_dashboard/content/database_clusters/views.py | 2 +- trove_dashboard/content/database_configurations/forms.py | 3 +-- trove_dashboard/content/databases/tabs.py | 4 ++-- trove_dashboard/content/databases/views.py | 2 +- .../content/databases/workflows/create_instance.py | 2 +- 10 files changed, 11 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index cb8c85d..e801619 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ Babel>=1.3 Django<1.9,>=1.8 django-compressor>=1.4 iso8601>=0.1.9 +oslo.log>=3.30.0 # Apache-2.0 python-keystoneclient!=1.8.0,>=1.6.0 python-swiftclient>=2.2.0 python-troveclient>=1.2.0 diff --git a/trove_dashboard/api/trove.py b/trove_dashboard/api/trove.py index 079c5d7..089187c 100644 --- a/trove_dashboard/api/trove.py +++ b/trove_dashboard/api/trove.py @@ -12,12 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.conf import settings from troveclient.v1 import client from openstack_dashboard.api import base +from oslo_log import log as logging from horizon.utils import functions as utils from horizon.utils.memoized import memoized # noqa diff --git a/trove_dashboard/content/database_backups/workflows/create_backup.py b/trove_dashboard/content/database_backups/workflows/create_backup.py index e1b8ca8..1ea17df 100644 --- a/trove_dashboard/content/database_backups/workflows/create_backup.py +++ b/trove_dashboard/content/database_backups/workflows/create_backup.py @@ -12,13 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms from horizon import workflows +from oslo_log import log as logging from trove_dashboard import api from trove_dashboard.content.databases \ diff --git a/trove_dashboard/content/database_clusters/forms.py b/trove_dashboard/content/database_clusters/forms.py index b4bb224..c66146d 100644 --- a/trove_dashboard/content/database_clusters/forms.py +++ b/trove_dashboard/content/database_clusters/forms.py @@ -15,7 +15,6 @@ import binascii import collections -import logging import uuid from django.core.urlresolvers import reverse @@ -27,6 +26,7 @@ from horizon import forms from horizon import messages from horizon.utils import memoized from openstack_dashboard import api +from oslo_log import log as logging from openstack_dashboard.dashboards.project.instances \ import utils as instance_utils diff --git a/trove_dashboard/content/database_clusters/tables.py b/trove_dashboard/content/database_clusters/tables.py index d80c134..55bb9d8 100644 --- a/trove_dashboard/content/database_clusters/tables.py +++ b/trove_dashboard/content/database_clusters/tables.py @@ -14,8 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.core import urlresolvers from django import shortcuts from django.template.defaultfilters import title # noqa @@ -28,6 +26,7 @@ from horizon.templatetags import sizeformat from horizon.utils import filters from horizon.utils import functions from horizon.utils import memoized +from oslo_log import log as logging from trove_dashboard import api from trove_dashboard.content.database_clusters import cluster_manager diff --git a/trove_dashboard/content/database_clusters/views.py b/trove_dashboard/content/database_clusters/views.py index 43cf729..8a27774 100644 --- a/trove_dashboard/content/database_clusters/views.py +++ b/trove_dashboard/content/database_clusters/views.py @@ -18,7 +18,6 @@ Views for managing database clusters. """ from collections import OrderedDict -import logging from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy @@ -31,6 +30,7 @@ from horizon import forms as horizon_forms from horizon import tables as horizon_tables from horizon import tabs as horizon_tabs from horizon.utils import memoized +from oslo_log import log as logging from trove_dashboard import api from trove_dashboard.content.database_clusters \ diff --git a/trove_dashboard/content/database_configurations/forms.py b/trove_dashboard/content/database_configurations/forms.py index f77cd0f..2aa7a62 100644 --- a/trove_dashboard/content/database_configurations/forms.py +++ b/trove_dashboard/content/database_configurations/forms.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ @@ -21,6 +19,7 @@ from horizon import exceptions from horizon import forms from horizon import messages from horizon.utils import memoized +from oslo_log import log as logging from trove_dashboard import api from trove_dashboard.content.database_configurations \ diff --git a/trove_dashboard/content/databases/tabs.py b/trove_dashboard/content/databases/tabs.py index 7acabb7..82c54f5 100644 --- a/trove_dashboard/content/databases/tabs.py +++ b/trove_dashboard/content/databases/tabs.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django import template from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs +from oslo_log import log as logging + from trove_dashboard import api from trove_dashboard.content.database_configurations import ( config_param_manager) diff --git a/trove_dashboard/content/databases/views.py b/trove_dashboard/content/databases/views.py index 6faada0..4e3bf04 100644 --- a/trove_dashboard/content/databases/views.py +++ b/trove_dashboard/content/databases/views.py @@ -16,7 +16,6 @@ Views for managing database instances. """ from collections import OrderedDict -import logging from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy @@ -32,6 +31,7 @@ from horizon.utils import memoized from horizon import workflows as horizon_workflows from openstack_dashboard.dashboards.project.instances \ import utils as instance_utils +from oslo_log import log as logging from trove_dashboard import api from trove_dashboard.content.databases import forms diff --git a/trove_dashboard/content/databases/workflows/create_instance.py b/trove_dashboard/content/databases/workflows/create_instance.py index c00891f..6223058 100644 --- a/trove_dashboard/content/databases/workflows/create_instance.py +++ b/trove_dashboard/content/databases/workflows/create_instance.py @@ -13,7 +13,6 @@ # under the License. import binascii -import logging from django.conf import settings from django.core.urlresolvers import reverse @@ -28,6 +27,7 @@ from openstack_dashboard.dashboards.project.instances \ import utils as instance_utils from openstack_dashboard.dashboards.project.instances.workflows \ import create_instance as dash_create_instance +from oslo_log import log as logging from trove_dashboard import api