PKI Deployment Scriptlets

* Completed the following six 'scriptlets':
  * Dogtag 10: Python 'initialization.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/147)
  * Dogtag 10: Python 'instance_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/75)
  * Dogtag 10: Python 'webserver_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/140)
  * Dogtag 10: Python 'subsystem_layout.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/141)
  * Dogtag 10: Python 'war_explosion.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/76)
  * Dogtag 10: Python 'finalization.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/148)
* Created numerous PKI deployment helper utilities.
* Augmented logging to provide indentation.
* Generated logic for installation 'manifest'.
* Tested logic using '--dry_run' option and '-p' prefix options.
* Per initial review, removed numerous "constants" and consolidated
  logic into "master" dictionary.
* Corrected the following ticket:
  * Dogtag 10: Fix 'build_dogtag_pki' script to account for 'pki-deploy' RPM
    (https://fedorahosted.org/pki/ticket/138)
    Resolves Bugzilla Bug #810047 - build_dogtag_pki fails with requirements
    for pki-deploy
    (https://bugzilla.redhat.com/show_bug.cgi?id=810047)
* Created the following three 'scriptlets' as 'NOT YET IMPLEMENTED'
  place-holders:
  * Dogtag 10: Python 'security_databases.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/136)
  * Dogtag 10: Python 'slot_assignment.py' Installation Scriptlet
    (https://fedorahosted.org/pki/ticket/146)
  * Dogtag 10: Python 'configuration.py' Configuration Scriptlet
    (https://fedorahosted.org/pki/ticket/137)

1 files changed, 25 insertions, 5 deletions

diff --git a/base/deploy/src/scriptlets/pkilogging.py b/base/deploy/src/scriptlets/pkilogging.py
index 776677cfd..9b22ae39c 100644
--- a/base/deploy/src/scriptlets/pkilogging.py
+++ b/base/deploy/src/scriptlets/pkilogging.py
@@ -15,7 +15,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Copyright (C) 2011 Red Hat, Inc.
+# Copyright (C) 2012 Red Hat, Inc.
 # All rights reserved.
 #
 
@@ -31,16 +31,36 @@ def enable_pki_logger(log_dir, log_name, log_level, console_log_level, logger):
             os.makedirs(log_dir)
         except OSError:
             return OSError
+
+    # Establish 'file' logger using 'basicConfig()'
+    logging.LoggerAdapter(logging.getLogger(''), {'indent' : ''})
     logging.basicConfig(level=log_level,
                         format='%(asctime)s %(name)-12s ' +\
-                               '%(levelname)-8s %(message)s',
+                               '%(levelname)-8s ' +\
+                               '%(indent)s%(message)s',
                         datefmt='%Y-%m-%d %H:%M:%S',
                         filename=log_dir + "/" + log_name,
                         filemode='w')
+
+    # Establish 'console' logger
     console = logging.StreamHandler()
+    logging.LoggerAdapter(console, {'indent' : ''})
     console.setLevel(console_log_level)
-    formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-    console.setFormatter(formatter)
+    console_format = logging.Formatter('%(name)-12s: ' +\
+                                       '%(levelname)-8s ' +\
+                                       '%(indent)s%(message)s')
+    console.setFormatter(console_format)
     logging.getLogger('').addHandler(console)
-    return logging.getLogger(logger)
 
+    # Establish 'file' logger
+#   file = logging.FileHandler(log_dir + "/" + log_name, 'w')
+#   logging.LoggerAdapter(file, {'indent' : ''})
+#   file.setLevel(log_level)
+#   file_format = logging.Formatter('%(asctime)s %(name)-12s: ' +\
+#                                   '%(levelname)-8s ' +\
+#                                   '%(indent)s%(message)s',
+#                                   '%Y-%m-%d %H:%M:%S')
+#   file.setFormatter(file_format)
+#   logging.getLogger('').addHandler(file)
+
+    return logging.getLogger(logger)