Merge "Remove oslo.log code and clean up versionutils API"

openstack/common/eventlet_backdoor.py

@@ -19,6 +19,7 @@ from __future__ import print_function
 import copy
 import errno
 import gc
+import logging
 import os
 import pprint
 import socket
@@ -30,7 +31,6 @@ import greenlet
 from oslo.config import cfg
 
 from openstack.common._i18n import _LI
-from openstack.common import log as logging
 
 help_for_backdoor_port = (
     "Acceptable values are 0, <port>, and <start>:<end>, where 0 results "

openstack/common/loopingcall.py

@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
 import sys
 import time
 
@@ -22,7 +23,6 @@ from eventlet import event
 from eventlet import greenthread
 
 from openstack.common._i18n import _LE, _LW
-from openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

openstack/common/periodic_task.py

@@ -12,6 +12,7 @@
 #    under the License.
 
 import copy
+import logging
 import random
 import time
 
@@ -19,7 +20,6 @@ from oslo.config import cfg
 import six
 
 from openstack.common._i18n import _, _LE, _LI
-from openstack.common import log as logging
 
 
 periodic_opts = [

openstack/common/service.py

@@ -18,7 +18,7 @@
 """Generic Node base class for all workers that run on hosts."""
 
 import errno
-import logging as std_logging
+import logging
 import os
 import random
 import signal
@@ -39,7 +39,6 @@ from oslo.config import cfg
 
 from openstack.common import eventlet_backdoor
 from openstack.common._i18n import _LE, _LI, _LW
-from openstack.common import log as logging
 from openstack.common import systemd
 from openstack.common import threadgroup
 
@@ -163,7 +162,7 @@ class ServiceLauncher(Launcher):
         signo = 0
 
         LOG.debug('Full set of CONF:')
-        CONF.log_opt_values(LOG, std_logging.DEBUG)
+        CONF.log_opt_values(LOG, logging.DEBUG)
 
         try:
             if ready_callback:
@@ -377,7 +376,7 @@ class ProcessLauncher(object):
 
         systemd.notify_once()
         LOG.debug('Full set of CONF:')
-        CONF.log_opt_values(LOG, std_logging.DEBUG)
+        CONF.log_opt_values(LOG, logging.DEBUG)
 
         try:
             while True:

openstack/common/systemd.py

@@ -16,12 +16,11 @@
 Helper module for systemd service readiness notification.
 """
 
+import logging
 import os
 import socket
 import sys
 
-from openstack.common import log as logging
-
 
 LOG = logging.getLogger(__name__)
 

openstack/common/threadgroup.py

@@ -11,12 +11,12 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+import logging
 import threading
 
 import eventlet
 from eventlet import greenpool
 
-from openstack.common import log as logging
 from openstack.common import loopingcall
 
 

tests/unit/test_service.py

@@ -21,6 +21,7 @@ Unit Tests for service class
 from __future__ import print_function
 
 import errno
+import logging
 import multiprocessing
 import os
 import signal
@@ -37,7 +38,6 @@ from oslotest import base as test_base
 from oslotest import moxstubout
 
 from openstack.common import eventlet_backdoor
-from openstack.common import log as logging
 from openstack.common import service