Resolve Merge Conflict

CHANGELOG.md

@@ -10,6 +10,11 @@ Features:
 
 - None
 
+Refactoring:
+
+- `[ext.colorlog]` Support subclassing of ext_colorlog.
+    - [Issue #571](https://github.com/datafolklabs/cement/issues/571)
+
 
 ## 3.0.4 - May 17, 2019
 

CONTRIBUTORS.md

@@ -16,4 +16,5 @@ documentation, or testing:
 - Xavier RENE-CORAIL (xcorail)
 - Lucas Clay (mlclay)
 - Adam Hodges (ajhodges)
-- Stelios Tymvios (namedLambda)
+- Stelios Tymvios (namedLambda)
+- Spyros Vlachos (devspyrosv)

cement/ext/ext_colorlog.py

@@ -64,7 +64,8 @@ class ColorLogHandler(LoggingLogHandler):
 
     def _get_console_format(self):
         format = super(ColorLogHandler, self)._get_console_format()
-        colorize = self.app.config.get('log.colorlog', 'colorize_console_log')
+        colorize = self.app.config.get(self._meta.config_section,
+                                       'colorize_console_log')
         if sys.stdout.isatty() or 'CEMENT_TEST' in os.environ:
             if is_true(colorize):
                 format = "%(log_color)s" + format
@@ -72,13 +73,15 @@ class ColorLogHandler(LoggingLogHandler):
 
     def _get_file_format(self):
         format = super(ColorLogHandler, self)._get_file_format()
-        colorize = self.app.config.get('log.colorlog', 'colorize_file_log')
+        colorize = self.app.config.get(self._meta.config_section,
+                                       'colorize_file_log')
         if is_true(colorize):
             format = "%(log_color)s" + format
         return format
 
     def _get_console_formatter(self, format):
-        colorize = self.app.config.get('log.colorlog', 'colorize_console_log')
+        colorize = self.app.config.get(self._meta.config_section,
+                                       'colorize_console_log')
         if sys.stdout.isatty() or 'CEMENT_TEST' in os.environ:
             if is_true(colorize):
                 formatter = self._meta.formatter_class(
@@ -96,7 +99,8 @@ class ColorLogHandler(LoggingLogHandler):
         return formatter
 
     def _get_file_formatter(self, format):
-        colorize = self.app.config.get('log.colorlog', 'colorize_file_log')
+        colorize = self.app.config.get(self._meta.config_section,
+                                       'colorize_file_log')
         if is_true(colorize):
             formatter = self._meta.formatter_class(
                 format,