From 9d750828c73700dde68a652ed9c7226a0adbd46e Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Thu, 16 May 2019 00:48:40 -0700 Subject: [PATCH] Make logging format consistent with v8.3.0 --- src/ocrmypdf/__main__.py | 2 +- src/ocrmypdf/_jobcontext.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ocrmypdf/__main__.py b/src/ocrmypdf/__main__.py index 7ac5939f..3a154a2c 100755 --- a/src/ocrmypdf/__main__.py +++ b/src/ocrmypdf/__main__.py @@ -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) diff --git a/src/ocrmypdf/_jobcontext.py b/src/ocrmypdf/_jobcontext.py index 78465bb2..290a15e5 100644 --- a/src/ocrmypdf/_jobcontext.py +++ b/src/ocrmypdf/_jobcontext.py @@ -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, )