From 126673ad0d0861e7347391ad9f8d23a1b1e28bcb Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 14 Sep 2022 16:17:41 +0200 Subject: Split exception handling for reading state and running the server. --- fshare.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fshare.py b/fshare.py index e1bc684..85aae01 100755 --- a/fshare.py +++ b/fshare.py @@ -397,14 +397,15 @@ with contextlib.ExitStack() as stack: try: # read the state file state = PersistentState(state_dir_fd, logger) + except StateCorruptError: + logger.error('Corrupted state file') + sys.exit(1) + try: # launch the server server = FShareServer((args.address, args.port), args.ipv4, args.ipv6, state, args.data_dir, logger) server.serve_forever() - except StateCorruptError: - logger.error('Corrupted state file') - sys.exit(1) except KeyboardInterrupt: logger.info('Interrupted, exiting') sys.exit(0) -- cgit v1.2.3