Skip to content

Commit

Permalink
Update keystone wsgi httpd script for oslo logging
Browse files Browse the repository at this point in the history
When updating to the oslo logging module, it appears that this script
was missed, and erroneously still references .DEBUG, which is not
available in the oslo logging module.  This commit corrects the issue
and updates the reference to oslo log module to not be aliased to
"logging".

The extra logic to set the debug on the instantiated logger is still
needed to ensure all logging is seen (startup config logging, etc).

fixes-bug: 1220012
Change-Id: If5b4f9f28cb9d05f914848cbdb54b10c2c5f3b2d
  • Loading branch information
Morgan Fainberg committed Sep 3, 2013
1 parent 372a062 commit d98dca9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions httpd/keystone.py
Expand Up @@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.

import logging
import os

from paste import deploy
Expand All @@ -31,10 +32,9 @@

from keystone.common import environment
from keystone import config
from keystone.openstack.common import log as logging
from keystone.openstack.common import log


LOG = logging.getLogger(__name__)
CONF = config.CONF
CONF(project='keystone')
config.setup_logging(CONF)
Expand All @@ -43,7 +43,7 @@
name = os.path.basename(__file__)

if CONF.debug:
CONF.log_opt_values(logging.getLogger(CONF.prog), logging.DEBUG)
CONF.log_opt_values(log.getLogger(CONF.prog), logging.DEBUG)

# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
# The following is a reference to Python Paste Deploy documentation
Expand Down

0 comments on commit d98dca9

Please sign in to comment.