Merge "Fix logging in cfn-init and cfn-signal"

3 files changed, 12 insertions, 19 deletions

diff --git a/bin/cfn-hup b/bin/cfn-hup
index faeccaa..ab6f2a1 100755
--- a/bin/cfn-hup
+++ b/bin/cfn-hup
@@ -45,17 +45,12 @@ args = parser.parse_args()
 # Setup logging
 log_format = '%(levelname)s [%(asctime)s] %(message)s'
 log_file_name = "/var/log/cfn-hup.log"
+log_level = logging.INFO
+if args.verbose:
+    log_level = logging.DEBUG
 logging.basicConfig(filename=log_file_name,
                     format=log_format,
-                    level=logging.DEBUG)
-if args.verbose:
-    logging.basicConfig(filename=log_file_name,
-                        format=log_format,
-                        level=logging.DEBUG)
-else:
-    logging.basicConfig(filename=log_file_name,
-                        format=log_format,
-                        level=logging.INFO)
+                    level=log_level)
 
 LOG = logging.getLogger('cfntools')
 
diff --git a/bin/cfn-init b/bin/cfn-init
index fb658e4..99b369e 100755
--- a/bin/cfn-init
+++ b/bin/cfn-init
@@ -50,13 +50,12 @@ parser.add_argument('-c', '--configsets',
 args = parser.parse_args()
 
 log_format = '%(levelname)s [%(asctime)s] %(message)s'
-logging.basicConfig(format=log_format, level=logging.DEBUG)
+log_file_name = "/var/log/cfn-init.log"
+logging.basicConfig(filename=log_file_name,
+                    format=log_format,
+                    level=logging.DEBUG)
 
 LOG = logging.getLogger('cfntools')
-log_file_name = "/var/log/cfn-init.log"
-file_handler = logging.FileHandler(log_file_name)
-file_handler.setFormatter(logging.Formatter(log_format))
-LOG.addHandler(file_handler)
 
 metadata = cfn_helper.Metadata(args.stack_name,
                                args.logical_resource_id,
diff --git a/bin/cfn-signal b/bin/cfn-signal
index 776c759..dbebcaf 100755
--- a/bin/cfn-signal
+++ b/bin/cfn-signal
@@ -60,13 +60,12 @@ parser.add_argument('url',
 args = parser.parse_args()
 
 log_format = '%(levelname)s [%(asctime)s] %(message)s'
-logging.basicConfig(format=log_format, level=logging.DEBUG)
+log_file_name = "/var/log/cfn-signal.log"
+logging.basicConfig(filename=log_file_name,
+                    format=log_format,
+                    level=logging.DEBUG)
 
 LOG = logging.getLogger('cfntools')
-log_file_name = "/var/log/cfn-signal.log"
-file_handler = logging.FileHandler(log_file_name)
-file_handler.setFormatter(logging.Formatter(log_format))
-LOG.addHandler(file_handler)
 
 LOG.debug('cfn-signal called %s ' % (str(args)))
 if args.exit: