valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #116 from s0undt3ch/hotfix/proper-logging-import

Browse Source 
Import the logging module directly. Fixes #115.
This commit is contained in:
Seth House 2013-09-12 14:20:10 -07:00
commit 5a30e80843
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
saltapi/netapi/rest_cherrypy/__init__.py
View File

@ -6,6 +6,7 @@ This is run by ``salt-api`` and started in a multiprocess.
# pylint: disable=C0103
# Import Python libs
import logging
import os
import signal
import sys
@ -24,7 +25,7 @@ except ImportError as exc:
# Import Salt libs
import salt.log
logger = salt.log.logging.getLogger(__name__)
logger = logging.getLogger(__name__)
cpy_min = '3.2.2'
def __virtual__():

3
saltapi/netapi/rest_cherrypy/app.py
View File

@ -157,6 +157,7 @@ functionality.
# Import Python libs
import functools
import logging
import os
import json
import textwrap
@ -173,7 +174,7 @@ import salt.log
# Import salt-api libs
import saltapi
logger = salt.log.logging.getLogger(__name__)
logger = logging.getLogger(__name__)
def salt_token_tool():