Merge pull request #26 from craigtracey/improve-logging

Rework logging to support importing externally

barbicanclient/client.py

@@ -13,18 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import json
+import logging
 import os
 
 import requests
 
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common.gettextutils import _
 from barbicanclient import orders
 from barbicanclient import secrets
 
 
 LOG = logging.getLogger(__name__)
-logging.setup('barbicanclient')
 
 
 class HTTPError(Exception):

barbicanclient/common/auth.py

@@ -12,9 +12,13 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from keystoneclient.v2_0 import client as ksclient
 from keystoneclient import exceptions
 
+LOG = logging.getLogger(__name__)
+
 
 class AuthException(Exception):
     """Raised when authorization fails."""

barbicanclient/keep.py

@@ -19,6 +19,9 @@ import argparse
 
 from barbicanclient.common import auth
 from barbicanclient import client
+from barbicanclient.openstack.common import log as logging
+
+logging.setup('barbicanclient')
 
 
 class Keep:

barbicanclient/orders.py

@@ -12,9 +12,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from barbicanclient import base
 from barbicanclient.openstack.common.gettextutils import _
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common import timeutils
 
 

barbicanclient/secrets.py

@@ -12,8 +12,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from barbicanclient import base
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common.timeutils import parse_isotime