valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20262 from cachedout/tornado_error

Browse Source 
If tornado is not installed, raise error that will be seen
This commit is contained in:
Mike Place 2015-01-30 11:05:59 -07:00
commit b69a46b9ad
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/netapi/rest_tornado/__init__.py
View File

@ -19,7 +19,7 @@ try:
has_tornado = True
except ImportError as err:
has_tornado = False
logger.info('ImportError! {0}'.format(str(err)))
logger.error('ImportError! {0}'.format(str(err)))
import salt.auth
@ -37,7 +37,11 @@ def start():
'''
Start the saltnado!
'''
from . import saltnado
try:
from . import saltnado
except ImportError:
logger.error('ImportError! {0}'.format(str(err)))
return None
mod_opts = __opts__.get(__virtualname__, {})