diff options
| -rwxr-xr-x | ogclient | 9 | ||||
| -rw-r--r-- | src/ogClient.py | 5 |
2 files changed, 8 insertions, 6 deletions
@@ -88,9 +88,12 @@ def main(): if args.debug: logging.getLogger().setLevel('DEBUG') - client = ogClient(config=CONFIG) - client.connect() - client.run() + try: + client = ogClient(config=CONFIG) + client.connect() + client.run() + except Exception as e: + logging.critical(e) if __name__ == "__main__": main() diff --git a/src/ogClient.py b/src/ogClient.py index 31ee5d3..abacc12 100644 --- a/src/ogClient.py +++ b/src/ogClient.py @@ -31,8 +31,7 @@ class ogClient: self.mode = self.CONFIG['opengnsys']['mode'] if self.mode not in {'virtual', 'live', 'linux', 'windows'}: - logging.critical('Invalid ogClient mode') - raise ValueError('Mode not supported.') + raise ValueError(f'Invalid ogClient mode: {self.mode}.') if self.mode in {'linux', 'windows'}: self.event_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.event_sock.setblocking(0) @@ -191,4 +190,4 @@ class ogClient: message = event_sock.recv(4096).decode('utf-8').rstrip() self.send_event_hint(message) else: - logging.critical('Invalid state: %s', str(state)) + raise ValueError(f'Invalid ogClient run state: {str(state)}.') |