Make logging format consistent with v8.3.0

This commit is contained in:
James R. Barlow
2019-05-16 00:48:40 -07:00
parent 5e025c3382
commit 9d750828c7
2 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -466,7 +466,7 @@ def run(args=None):
options = parser.parse_args(args=args)
log = logging.getLogger()
formatter = logging.Formatter('%(levelname)s - %(message)s')
formatter = logging.Formatter('%(levelname)7s - %(message)s')
console = logging.StreamHandler(stream=sys.stderr)
console.setLevel(logging.DEBUG)
console.setFormatter(formatter)
+4 -2
View File
@@ -75,13 +75,15 @@ def cleanup_working_files(work_folder, options):
class LogNameAdapter(logging.LoggerAdapter):
def process(self, msg, kwargs):
return '[%s] %s' % (self.extra['filename'], msg), kwargs
# return '[%s] %s' % (self.extra['filename'], msg), kwargs
return '%s' % (msg,), kwargs
class LogNamePageAdapter(logging.LoggerAdapter):
def process(self, msg, kwargs):
return (
'[%s:%05u] %s' % (self.extra['filename'], self.extra['page'], msg),
#'[%s:%05u] %s' % (self.extra['filename'], self.extra['page'], msg),
'%4u: %s' % (self.extra['page'], msg),
kwargs,
)