Merge pull request #2324 from s0undt3ch/develop

Complement #2323.

salt/auth/ldap.py

@@ -13,6 +13,8 @@ import traceback
 # Import Salt libs
 from salt.exceptions import CommandExecutionError, SaltInvocationError
 
+log = logging.getLogger(__name__)
+
 # Import third party libs
 from jinja2 import Environment
 try:
@@ -22,8 +24,6 @@ except ImportError:
     log.error('Failed to import LDAP module, LDAP authentication disabled')
     log.error(traceback.format_exc())
 
-log = logging.getLogger(__name__)
-
 # Defaults, override in master config
 __defopts__ = {'auth.ldap.server': 'localhost',
                'auth.ldap.port': '389',

salt/utils/parsers.py

@@ -277,8 +277,9 @@ class LogLevelMixIn(object):
         self.add_option(
             '-l', '--log-level',
             choices=list(log.LOG_LEVELS),
-            help=('Logging log level. One of {0}. For the logfile settings see '
-                  'the configuration file. Default: \'{1}\'.').format(
+            help=('Console logging log level. One of {0}. For the log file '
+                  'setting see the configuration file. '
+                  'Default: \'{1}\'.').format(
                       ', '.join([repr(l) for l in log.SORTED_LEVEL_NAMES]),
                       getattr(self, '_default_logging_level_', 'warning')
                   )
@@ -697,7 +698,7 @@ class SaltCMDOptionParser(OptionParser, ConfigDirMixIn, TimeoutMixIn,
             default=False,
             dest='mktoken',
             action='store_true',
-            help=('Generate and save an authentication token for re-use. The' 
+            help=('Generate and save an authentication token for re-use. The'
                   'token is generated and made available for the period '
                   'defined in the Salt Master.')
             )