Use dest args dto

Author: Juliya Smith

c42seceventcli/aed/args.py

@@ -118,6 +118,7 @@ def verify_username_arg(self):
             self._raise_value_error("Code42 username not provided.")
 
     def verify_destination_args(self):
+        self.destination_type = self.destination_type.lower()
         if self.destination_type == "stdout" and self.destination is not None:
             msg = (
                 "Destination '{0}' not applicable for stdout. "

c42seceventcli/aed/main.py

@@ -58,49 +58,50 @@ def _create_handlers(args):
     handlers.handle_error = error_logger.error
     output_format = args.output_format
     logger_formatter = _get_log_formatter(output_format)
+    destination_args = _create_destination_args(args)
     logger = _get_logger(
-        formatter=logger_formatter,
-        service_name=_SERVICE_NAME,
-        destination=args.destination,
-        destination_type=args.destination_type,
-        destination_port=int(args.destination_port),
-        destination_protocol=args.destination_protocol,
+        formatter=logger_formatter, service_name=_SERVICE_NAME, destination_args=destination_args
     )
     handlers.handle_response = _get_response_handler(logger)
     return handlers
 
 
-def _get_logger(
-    formatter,
-    service_name,
-    destination,
-    destination_type,
-    destination_port=514,
-    destination_protocol="TCP",
-):
+def _create_destination_args(args):
+    destination_args = common.DestinationArgs()
+    destination_args.destination_type = args.destination_type
+    destination_args.destination = args.destination
+    destination_args.destination_port = args.destination_port
+    destination_args.destination_protocol = args.destination_protocol
+    return destination_args
+
+
+def _get_logger(formatter, service_name, destination_args):
     try:
         return common.get_logger(
-            formatter=formatter,
-            service_name=service_name,
-            destination=destination,
-            destination_type=destination_type,
-            destination_port=destination_port,
-            destination_protocol=destination_protocol,
+            formatter=formatter, service_name=service_name, destination_args=destination_args
         )
     except (herror, gaierror, timeout) as ex:
         print(repr(ex))
-        print(
-            "Hostname={0}, port={1}, protocol={2}.".format(
-                destination, destination_port, destination_protocol
-            )
-        )
+        _print_server_args(destination_args)
         exit(1)
     except IOError as ex:
         print(repr(ex))
-        print("File path: {0}.".format(destination))
+        if ex.errno == 61:
+            _print_server_args(destination_args)
+            return
+
+        print("File path: {0}.".format(destination_args.destination))
         exit(1)
 
 
+def _print_server_args(server_args):
+    print(
+        "Hostname={0}, port={1}, protocol={2}.".format(
+            server_args.destination, server_args.destination_port, server_args.destination_protocol
+        )
+    )
+
+
 def _set_up_cursor_store(record_cursor, clear_cursor, handlers):
     if record_cursor or clear_cursor:
         store = AEDCursorStore()

c42seceventcli/common/util.py

@@ -65,39 +65,33 @@ def get_error_logger(service_name):
     return logger
 
 
-def get_logger(
-    formatter,
-    service_name,
-    destination,
-    destination_type,
-    destination_port=514,
-    destination_protocol="TCP",
-):
-    destination_type = destination_type.lower()
+class DestinationArgs(object):
+    destination_type = None
+    destination = None
+    destination_port = 514
+    destination_protocol = "TCP"
+
+
+def get_logger(formatter, service_name, destination_args):
     logger = logging.getLogger("{0}_logger".format(service_name))
-    handler = _get_log_handler(
-        destination=destination,
-        destination_type=destination_type,
-        destination_port=destination_port,
-        destination_protocol=destination_protocol,
-    )
+    handler = _get_log_handler(destination_args)
     handler.setFormatter(formatter)
     logger.addHandler(handler)
     logger.setLevel(logging.INFO)
     return logger
 
 
-def _get_log_handler(
-    destination, destination_type, destination_port=514, destination_protocol="TCP"
-):
-    if destination_type == "stdout":
+def _get_log_handler(destination_args):
+    if destination_args.destination_type == "stdout":
         return logging.StreamHandler(sys.stdout)
-    elif destination_type == "server":
+    elif destination_args.destination_type == "server":
         return NoPrioritySysLogHandler(
-            hostname=destination, port=destination_port, protocol=destination_protocol
+            hostname=destination_args.destination,
+            port=destination_args.destination_port,
+            protocol=destination_args.destination_protocol,
         )
-    elif destination_type == "file":
-        return logging.FileHandler(filename=destination)
+    elif destination_args.destination_type == "file":
+        return logging.FileHandler(filename=destination_args.destination)
 
 
 def get_stored_password(service_name, username):

tests/aed/test_main.py

@@ -222,15 +222,15 @@ def test_main_when_destination_port_is_set_passes_port_to_get_logger(patches):
     expected = 1000
     patches.aed_args.destination_port = expected
     main.main()
-    actual = patches.get_logger.call_args[1]["destination_port"]
+    actual = patches.get_logger.call_args[1]["destination_args"].destination_port
     assert actual == expected
 
 
 def test_main_when_given_destination_protocol_via_cli_passes_port_to_get_logger(patches):
     expected = "SOME PROTOCOL"
     patches.aed_args.destination_protocol = expected
     main.main()
-    actual = patches.get_logger.call_args[1]["destination_protocol"]
+    actual = patches.get_logger.call_args[1]["destination_args"].destination_protocol
     assert actual == expected
 
 

tests/common/test_common.py

@@ -2,7 +2,6 @@
 from os import path
 from datetime import datetime, timedelta
 from logging import StreamHandler, FileHandler
-from logging.handlers import RotatingFileHandler
 
 from c42secevents.logging.handlers import NoPrioritySysLogHandler
 
@@ -15,6 +14,7 @@
     get_stored_password,
     delete_stored_password,
     get_user_project_path,
+    DestinationArgs,
 )
 
 
@@ -223,7 +223,9 @@ def test_get_error_logger_uses_rotating_file_with_expected_args(mocker, mock_get
 
 def test_get_logger_when_destination_type_is_stdout_adds_stream_handler_to_logger(mock_get_logger):
     service = "TEST_SERVICE"
-    logger = get_logger(None, service, "Somewhere", "stdout")
+    args = DestinationArgs()
+    args.destination_type = "stdout"
+    logger = get_logger(None, service, args)
     actual = type(logger.addHandler.call_args[0][0])
     expected = StreamHandler
     assert actual == expected
@@ -233,7 +235,9 @@ def test_get_logger_when_destination_type_is_file_adds_file_handler_to_logger(
     mock_get_logger, mock_file_handler
 ):
     service = "TEST_SERVICE"
-    logger = get_logger(None, service, "Somewhere", "file")
+    args = DestinationArgs()
+    args.destination_type = "file"
+    logger = get_logger(None, service, args)
     actual = type(logger.addHandler.call_args[0][0])
     expected = FileHandler
     assert actual == expected
@@ -243,7 +247,9 @@ def test_get_logger_when_destination_type_is_server_adds_no_priority_syslog_hand
     mock_get_logger, mock_no_priority_syslog_handler
 ):
     service = "TEST_SERVICE"
-    logger = get_logger(None, service, "Somewhere", "server")
+    args = DestinationArgs()
+    args.destination_type = "server"
+    logger = get_logger(None, service, args)
     actual = type(logger.addHandler.call_args[0][0])
     expected = NoPrioritySysLogHandler
     assert actual == expected