Switch to the oslo_log library

Remove the log module of oslo-incubator.
Move the WritableLogger wrapper to the base_wsgi module.
Add oslo.log to the requirements.

Change-Id: I724fa6090cebf40e7d7c78cc6b8458dfba9508a8

8 files changed, 9 insertions, 9 deletions

diff --git a/trove/db/sqlalchemy/migrate_repo/schema.py b/trove/db/sqlalchemy/migrate_repo/schema.py
index 48d4a30b..cc7b3cee 100644
--- a/trove/db/sqlalchemy/migrate_repo/schema.py
+++ b/trove/db/sqlalchemy/migrate_repo/schema.py
@@ -15,10 +15,9 @@
 
 """Various conveniences used for migration scripts."""
 
+from oslo_log import log as logging
 import sqlalchemy.types
 
-from trove.openstack.common import log as logging
-
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/020_configurations.py b/trove/db/sqlalchemy/migrate_repo/versions/020_configurations.py
index 4a433c48..e5c91cce 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/020_configurations.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/020_configurations.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import ForeignKey
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import MetaData
@@ -24,7 +25,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import drop_tables
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
 from trove.db.sqlalchemy import utils as db_utils
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/023_add_instance_indexes.py b/trove/db/sqlalchemy/migrate_repo/versions/023_add_instance_indexes.py
index b3547131..d1195e01 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/023_add_instance_indexes.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/023_add_instance_indexes.py
@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/024_add_backup_indexes.py b/trove/db/sqlalchemy/migrate_repo/versions/024_add_backup_indexes.py
index 75df8383..22be0a79 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/024_add_backup_indexes.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/024_add_backup_indexes.py
@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/025_add_service_statuses_indexes.py b/trove/db/sqlalchemy/migrate_repo/versions/025_add_service_statuses_indexes.py
index dcc226b2..62eefe8a 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/025_add_service_statuses_indexes.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/025_add_service_statuses_indexes.py
@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/026_datastore_versions_unique_fix.py b/trove/db/sqlalchemy/migrate_repo/versions/026_datastore_versions_unique_fix.py
index 3a04f13c..daa9ea88 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/026_datastore_versions_unique_fix.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/026_datastore_versions_unique_fix.py
@@ -13,11 +13,11 @@
 #    under the License.
 
 from migrate.changeset import UniqueConstraint
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/028_recreate_agent_heartbeat.py b/trove/db/sqlalchemy/migrate_repo/versions/028_recreate_agent_heartbeat.py
index 1e2acf92..d869ee36 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/028_recreate_agent_heartbeat.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/028_recreate_agent_heartbeat.py
@@ -12,16 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import MetaData
+
 from trove.db.sqlalchemy.migrate_repo.schema import Boolean
 from trove.db.sqlalchemy.migrate_repo.schema import create_tables
 from trove.db.sqlalchemy.migrate_repo.schema import DateTime
 from trove.db.sqlalchemy.migrate_repo.schema import drop_tables
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/032_clusters.py b/trove/db/sqlalchemy/migrate_repo/versions/032_clusters.py
index 590077d4..ca7a9e76 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/032_clusters.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/032_clusters.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import ForeignKey
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import Index
@@ -26,7 +27,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import Integer
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
 from trove.db.sqlalchemy import utils as db_utils
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')