diff options
| author | Ade Lee <alee@redhat.com> | 2013-04-26 10:35:09 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2013-04-26 11:14:04 -0400 |
| commit | 23d952111f1dede19b38b13e1a54a1bd3fc29735 (patch) | |
| tree | 0523ebf550e6b7ec860a383fb4be72be2484d82a /base/server/src/engine | |
| parent | 5c4dd46f5f71900d75c78f72c20ca57b2279a048 (diff) | |
Set log level in logfile to debug in pkispawn
The log file is not very useful without the level of logging.
If you have occasion to go to the log file, then you want to
see all the gory details, This of course is valid for pkidestroy too.
Also removed an unneeded import introduced by mistake.
Diffstat (limited to 'base/server/src/engine')
| -rw-r--r-- | base/server/src/engine/pkihelper.py | 1 | ||||
| -rw-r--r-- | base/server/src/engine/pkimessages.py | 8 | ||||
| -rw-r--r-- | base/server/src/engine/pkiparser.py | 16 |
3 files changed, 7 insertions, 18 deletions
diff --git a/base/server/src/engine/pkihelper.py b/base/server/src/engine/pkihelper.py index a18b0477d..7e086a93b 100644 --- a/base/server/src/engine/pkihelper.py +++ b/base/server/src/engine/pkihelper.py @@ -34,7 +34,6 @@ import string import subprocess import time import types -import urllib2 from datetime import datetime from grp import getgrgid from grp import getgrnam diff --git a/base/server/src/engine/pkimessages.py b/base/server/src/engine/pkimessages.py index 8aee018d3..6f390fe9e 100644 --- a/base/server/src/engine/pkimessages.py +++ b/base/server/src/engine/pkimessages.py @@ -47,10 +47,9 @@ PKI_DICTIONARY_WEB_SERVER="\n"\ PKI_VERBOSITY=\ "VERBOSITY FLAGS CONSOLE MESSAGE LEVEL LOG MESSAGE LEVEL\n"\ "=======================================================================\n"\ -" NONE error|warning error|warning|info\n"\ -" -v error|warning|info error|warning|info\n"\ -" -vv error|warning|info error|warning|info|debug\n"\ -" -vvv error|warning|info|debug error|warning|info|debug\n"\ +" NONE error|warning error|warning|info|debug\n"\ +" -v error|warning|info error|warning|info|debug\n"\ +" -vv error|warning|info|debug error|warning|info|debug\n"\ " " @@ -103,7 +102,6 @@ PKI_SYMLINK_MISSING_OR_NOT_A_SYMLINK_1 = "Symlink '%s' is either missing "\ "or is NOT a symbolic link!" PKI_UNABLE_TO_PARSE_1 = "'Could not parse: '%s'" PKI_UNABLE_TO_CREATE_LOG_DIRECTORY_1 = "Could not create log directory '%s'!" -PKI_VERBOSITY_LEVELS_MESSAGE = "Only up to 3 levels of verbosity are supported!" # PKI Deployment 'pkispawn' and 'pkidestroy' Messages diff --git a/base/server/src/engine/pkiparser.py b/base/server/src/engine/pkiparser.py index 4fbabe1a3..8918eb8a6 100644 --- a/base/server/src/engine/pkiparser.py +++ b/base/server/src/engine/pkiparser.py @@ -99,22 +99,14 @@ class PKIConfigParser: # '-v' if args.pki_verbosity == 1: config.pki_console_log_level = logging.INFO - config.pki_log_level = logging.INFO - elif args.pki_verbosity == 2: - config.pki_console_log_level = logging.INFO - config.pki_log_level = logging.DEBUG - elif args.pki_verbosity == 3: + elif args.pki_verbosity >= 2: config.pki_console_log_level = logging.DEBUG - config.pki_log_level = logging.DEBUG - elif args.pki_verbosity > 3: - print "ERROR: " + log.PKI_VERBOSITY_LEVELS_MESSAGE - print - self.arg_parser.print_help() - self.arg_parser.exit(-1); else: # Set default log levels config.pki_console_log_level = logging.WARNING - config.pki_log_level = logging.INFO + + # Debug log is always at DEBUG level + config.pki_log_level = logging.DEBUG # Process 'Test' command-line options # '-p' |