Skip to content

Commit 39433df

Browse files
committed
Use terminate instead of exit
1 parent 538ba89 commit 39433df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sofar2mqtt-v2.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ def __init__(self, daemon, retry, retry_delay, write_retry, write_retry_delay, r
6363
self.raw_data['serial_number'] = self.determine_serial_number()
6464
if not self.raw_data['serial_number']:
6565
logging.error("Failed to determine serial number. Exiting")
66-
exit(1)
66+
self.terminate(status_code=1)
6767
self.raw_data['model'] = self.determine_model()
6868
self.raw_data['protocol'] = self.determine_modbus_protocol()
6969

7070
if self.raw_data.get('protocol') == "SOFAR-1-40KTL.json":
7171
logging.error("Unsupported protocol detected. Exiting")
72-
exit(1)
72+
self.terminate(status_code=1)
7373

7474
protocol_file = self.raw_data.get('protocol')
7575
if not os.path.isfile(protocol_file):
7676
logging.error(f"Protocol file {protocol_file} does not exist. Exiting")
77-
exit(1)
77+
self.terminate(status_code=1)
7878

7979
self.config = load_config(protocol_file)
8080
self.write_registers = []
@@ -377,12 +377,12 @@ def signal_handler(self, sig, _frame):
377377
logging.info(f"Received signal {sig}, attempting to stop")
378378
self.daemon = False
379379

380-
def terminate(self):
380+
def terminate(self, status_code=0):
381381
logging.info("Terminating")
382382
logging.info(f"Publishing offline to sofar2mqtt_python/bridge")
383383
self.client.publish("sofar2mqtt_python/bridge", "offline", retain=False)
384384
self.client.loop_stop()
385-
exit(0)
385+
exit(status_code)
386386

387387
def main(self):
388388
""" Main method """
@@ -400,7 +400,7 @@ def main(self):
400400
self.publish_state()
401401
time.sleep(self.refresh_interval)
402402
self.iteration+=1
403-
self.terminate()
403+
self.terminate(status_code=0)
404404

405405
def write_register(self, register, value):
406406
""" Read value from register with a retry mechanism """

0 commit comments

Comments
 (0)