From 60f21c0df4adaf3573e5e2f708a2237af83b458e Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 4 Jul 2018 13:30:32 +0200 Subject: Factorise FIFO filename creation. --- poezio/core/core.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/poezio/core/core.py b/poezio/core/core.py index bea42f11..8356c025 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -761,14 +761,15 @@ class Core(object): if config.get('exec_remote'): # We just write the command in the fifo fifo_path = config.get('remote_fifo_path') + filename = os.path.join(fifo_path, 'poezio.fifo') if not self.remote_fifo: try: self.remote_fifo = Fifo( - os.path.join(fifo_path, 'poezio.fifo'), 'w') + filename, 'w') except (OSError, IOError) as exc: log.error( 'Could not open the fifo for writing (%s)', - os.path.join(fifo_path, './', 'poezio.fifo'), + filename, exc_info=True) self.information('Could not open the fifo ' 'file for writing: %s' % exc, 'Error') @@ -778,10 +779,10 @@ class Core(object): command_str = ' '.join(args) + '\n' try: self.remote_fifo.write(command_str) - except (IOError) as exc: + except IOError as exc: log.error( 'Could not write in the fifo (%s): %s', - os.path.join(fifo_path, './', 'poezio.fifo'), + filename, repr(command), exc_info=True) self.information('Could not execute %s: %s' % (command, exc), -- cgit v1.2.3