Skip to content

Commit a76c76b

Browse files
committed
sq-poller: print critical exceptions in the log file
Signed-off-by: Claudio Lorina <[email protected]>
1 parent 1e3c5c9 commit a76c76b

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

suzieq/poller/sq_poller.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ async def start_controller(user_args: argparse.Namespace, config_data: Dict):
5252
if not log_stdout:
5353
print(f"ERROR: {error}")
5454
logger.error(error)
55-
sys.exit(-1)
55+
sys.exit(1)
56+
except Exception as error:
57+
if not log_stdout:
58+
traceback.print_exc()
59+
logger.critical(f'{error}\n{traceback.format_exc()}')
60+
sys.exit(1)
5661

5762

5863
def controller_main():
@@ -198,8 +203,6 @@ def controller_main():
198203
asyncio.run(start_controller(args, cfg))
199204
except (KeyboardInterrupt, RuntimeError):
200205
pass
201-
except Exception: # pylint: disable=broad-except
202-
traceback.print_exc()
203206

204207

205208
if __name__ == '__main__':

suzieq/poller/worker/sq_worker.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
from typing import Dict
99

1010
import uvloop
11-
1211
from suzieq.poller.worker.worker import Worker
1312
from suzieq.poller.worker.writers.output_worker import OutputWorker
1413
from suzieq.shared.exceptions import InventorySourceError, SqPollerConfError
15-
from suzieq.shared.utils import poller_log_params, init_logger, load_sq_config
14+
from suzieq.shared.utils import init_logger, load_sq_config, poller_log_params
1615

1716

1817
async def start_worker(userargs: argparse.Namespace, cfg: Dict):
@@ -36,8 +35,14 @@ async def start_worker(userargs: argparse.Namespace, cfg: Dict):
3635
await worker.init_worker()
3736
await worker.run()
3837
except (SqPollerConfError, InventorySourceError) as error:
38+
if not log_stdout:
39+
print(error)
3940
logger.error(error)
40-
print(error)
41+
sys.exit(1)
42+
except Exception as error:
43+
if not log_stdout:
44+
traceback.print_exc()
45+
logger.critical(f'{error}\n{traceback.format_exc()}')
4146
sys.exit(1)
4247

4348

@@ -130,8 +135,6 @@ def worker_main():
130135
asyncio.run(start_worker(userargs, cfg))
131136
except (KeyboardInterrupt, RuntimeError):
132137
pass
133-
except Exception: # pylint: disable=broad-except
134-
traceback.print_exc()
135138

136139
sys.exit(0)
137140

0 commit comments

Comments
 (0)