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

Import salt.log at saltapi package level. Missed one salt.log.logging. Fixes #115.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-09-13 10:27:57 +01:00
parent 5a30e80843
commit 7fc6ba4589
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
saltapi/__init__.py
View File

@ -5,6 +5,7 @@ Make api awesomeness
import inspect
# Import Salt libs
import salt.log # pylint: disable=W0611
import salt.client
import salt.runner
import salt.wheel

6
saltapi/client.py
View File

@ -2,15 +2,13 @@
The main entry point for salt-api
'''
# Import python libs
import logging
import multiprocessing
# Import salt libs
import salt.log
# Import salt-api libs
import saltapi.loader
logger = salt.log.logging.getLogger(__name__)
logger = logging.getLogger(__name__)
class SaltAPIClient(object):
'''

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

@ -22,9 +22,6 @@ try:
except ImportError as exc:
cpy_error = exc
# Import Salt libs
import salt.log
logger = logging.getLogger(__name__)
cpy_min = '3.2.2'

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

@ -169,7 +169,6 @@ import yaml
# Import Salt libs
import salt
import salt.auth
import salt.log
# Import salt-api libs
import saltapi