atomicshop 2.16.13__py3-none-any.whl → 2.16.14__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.16.13'
+__version__ = '2.16.14'

atomicshop/mitm/config_static.py

@@ -4,7 +4,10 @@ from dataclasses import dataclass
 from . import import_config
 
 
-SCRIPT_VERSION: str = '1.7.4'
+SCRIPT_VERSION: str = '1.7.5'
+"""
+Added logs backup days
+"""
 
 
 # CONFIG = None
@@ -105,6 +108,7 @@ class LogRec:
     logs_path: str
     recordings_path: str
     enable_request_response_recordings_in_logs: bool
+    store_logs_for_x_days: int
 
     recordings_directory_name: str = 'recs'
 

atomicshop/mitm/initialize_engines.py

@@ -9,6 +9,8 @@ from ..wrappers.loggingw import loggingw
 from .engines.__reference_general import parser___reference_general, responder___reference_general, \
     recorder___reference_general
 
+from . import config_static
+
 
 class ModuleCategory:
     def __init__(self, script_directory: str):
@@ -89,7 +91,8 @@ class ModuleCategory:
             add_stream=True,
             add_timedfile=True,
             formatter_streamhandler='DEFAULT',
-            formatter_filehandler='DEFAULT'
+            formatter_filehandler='DEFAULT',
+            backupCount=config_static.LogRec.store_logs_for_x_days
         )
 
 

atomicshop/mitm/mitm_main.py

@@ -65,7 +65,8 @@ def mitm_server_main(config_file_path: str):
         add_stream=True,
         add_timedfile=True,
         formatter_streamhandler='DEFAULT',
-        formatter_filehandler='DEFAULT'
+        formatter_filehandler='DEFAULT',
+        backupCount=config_static.LogRec.store_logs_for_x_days
     )
 
     # Writing first log.
@@ -208,7 +209,8 @@ def mitm_server_main(config_file_path: str):
         add_stream=True,
         add_timedfile=True,
         formatter_streamhandler='DEFAULT',
-        formatter_filehandler='DEFAULT'
+        formatter_filehandler='DEFAULT',
+        backupCount=config_static.LogRec.store_logs_for_x_days
     )
     system_logger.info(f"Loaded network logger: {network_logger}")
 
@@ -227,12 +229,13 @@ def mitm_server_main(config_file_path: str):
             dns_server_instance = dns_server.DnsServer(
                 listening_interface=config_static.DNSServer.listening_interface,
                 listening_port=config_static.DNSServer.listening_port,
+                log_directory_path=config_static.LogRec.logs_path,
+                backupCount_log_files_x_days=config_static.LogRec.store_logs_for_x_days,
                 forwarding_dns_service_ipv4=config_static.DNSServer.forwarding_dns_service_ipv4,
                 tcp_target_server_ipv4=config_static.DNSServer.target_tcp_server_ipv4,
                 # Passing the engine domain list to DNS server to work with.
                 # 'list' function re-initializes the current list, or else it will be the same instance object.
                 tcp_resolve_domain_list=list(config_static.Certificates.domains_all_times),
-                log_directory_path=config_static.LogRec.logs_path,
                 offline_mode=config_static.DNSServer.offline_mode,
                 resolve_to_tcp_server_only_tcp_resolve_domains=(
                     config_static.DNSServer.resolve_to_tcp_server_only_engine_domains),

atomicshop/wrappers/loggingw/handlers.py

@@ -124,6 +124,7 @@ def _wrap_do_rollover(handler, header):
     handler.doRollover = new_do_rollover
 
 
+# noinspection PyPep8Naming
 def add_timedfilehandler_with_queuehandler(
         logger: logging.Logger,
         file_path: str,
@@ -144,6 +145,7 @@ def add_timedfilehandler_with_queuehandler(
         when: str = 'midnight',
         interval: int = 1,
         delay: bool = True,
+        backupCount: int = 0,
         encoding=None,
         header: str = None
 ):
@@ -164,15 +166,16 @@ def add_timedfilehandler_with_queuehandler(
     filesystem.create_directory(os.path.dirname(file_path))
 
     file_handler = get_timed_rotating_file_handler(
-        file_path, when=when, interval=interval, delay=delay, encoding=encoding)
+        file_path, when=when, interval=interval, delay=delay, backupCount=backupCount, encoding=encoding)
 
     loggers.set_logging_level(file_handler, logging_level)
 
     formatter = _process_formatter_attribute(formatter, file_type=file_type)
 
     # If formatter was passed to the function we'll add it to handler.
+    # noinspection GrazieInspection
     if formatter:
-        # Convert string to Formatter object. Moved to newer styling of python 3: style='{'
+        # Convert string to Formatter object. Moved to newer styling of python 3: style='{'.
         logging_formatter = formatters.get_logging_formatter_from_string(
             formatter=formatter, use_nanoseconds=formatter_use_nanoseconds)
         # Setting the formatter in file handler.
@@ -240,8 +243,14 @@ def get_stream_handler() -> logging.StreamHandler:
     return logging.StreamHandler()
 
 
+# noinspection PyPep8Naming
 def get_timed_rotating_file_handler(
-        log_file_path: str, when: str = "midnight", interval: int = 1, delay: bool = False, encoding=None
+        log_file_path: str,
+        when: str = "midnight",
+        interval: int = 1,
+        backupCount: int = 0,
+        delay: bool = False,
+        encoding=None
 ) -> TimedRotatingFileHandler:
     """
     Function to get a TimedRotatingFileHandler.
@@ -255,13 +264,16 @@ def get_timed_rotating_file_handler(
         "D" - Days
         "midnight" - Roll over at midnight
     :param interval: Interval to rotate the log file.
+    :param backupCount: int, Number of backup files to keep. Default is 0.
+        If backupCount is > 0, when rollover is done, no more than backupCount files are kept, the oldest are deleted.
+        If backupCount is == 0, all the backup files will be kept.
     :param delay: bool, If set to True, the log file will be created only if there's something to write.
     :param encoding: Encoding to use for the log file. Same as for the TimeRotatingFileHandler, which uses Default None.
     :return: TimedRotatingFileHandler.
     """
 
     return TimedRotatingFileHandler(
-        filename=log_file_path, when=when, interval=interval, delay=delay, encoding=encoding)
+        filename=log_file_path, when=when, interval=interval, backupCount=backupCount, delay=delay, encoding=encoding)
 
 
 def start_queue_listener_for_file_handler(

atomicshop/wrappers/loggingw/loggingw.py

@@ -32,6 +32,7 @@ def create_logger(
         filehandler_rotation_use_default_namer_function: bool = True,
         when: str = "midnight",
         interval: int = 1,
+        backupCount: int = 0,
         delay: bool = False,
         encoding=None,
         header: str = None
@@ -95,6 +96,9 @@ def create_logger(
     :param interval: int, Interval to rotate the log file. Default is 1.
         If 'when="midnight"' and 'interval=1', then the log file will be rotated every midnight.
         If 'when="midnight"' and 'interval=2', then the log file will be rotated every 2nd midnights.
+    :param backupCount: int, Number of backup files to keep. Default is 0.
+        If backupCount is > 0, when rollover is done, no more than backupCount files are kept, the oldest are deleted.
+        If backupCount is == 0, all the backup files will be kept.
     :param delay: bool, If set to True, the log file will be created only if there's something to write.
     :param encoding: string, Encoding to use for the log file. Default is None.
     :param header: string, Header to write to the log file.
@@ -181,7 +185,7 @@ def create_logger(
             rotation_date_format=filehandler_rotation_date_format,
             rotation_callback_namer_function=filehandler_rotation_callback_namer_function,
             rotation_use_default_callback_namer_function=filehandler_rotation_use_default_namer_function,
-            when=when, interval=interval, delay=delay, encoding=encoding, header=header)
+            when=when, interval=interval, delay=delay, backupCount=backupCount, encoding=encoding, header=header)
 
     return logger
 

atomicshop/wrappers/socketw/dns_server.py

@@ -35,6 +35,7 @@ class DnsServer:
             listening_interface: str,
             listening_port: int,
             log_directory_path: str,
+            backupCount_log_files_x_days: int = 0,
             forwarding_dns_service_ipv4: str = '8.8.8.8',
             forwarding_dns_service_port: int = 53,
             resolve_to_tcp_server_only_tcp_resolve_domains: bool = False,
@@ -56,6 +57,9 @@ class DnsServer:
             Example: '0.0.0.0'. For all interfaces.
         :param listening_port: int: Port number that the DNS Server will listen on.
         :param log_directory_path: str: Path to the directory where the logs will be saved.
+        :param backupCount_log_files_x_days: int: How many days the log files will be kept.
+            Default is 0, which means that the log files will be kept indefinitely.
+            More than 0 means that the log files will be deleted after the specified days.
         :param forwarding_dns_service_ipv4: str: IPv4 address of the DNS Service that will be used for resolving.
             Example: '8.8.8.8'. For Google DNS Service.
         :param forwarding_dns_service_port: int: Port number of the DNS Service that will be used for resolving.
@@ -126,7 +130,8 @@ class DnsServer:
             logger_name="dns",
             directory_path=self.log_directory_path,
             add_timedfile=True,
-            formatter_filehandler='DEFAULT'
+            formatter_filehandler='DEFAULT',
+            backupCount=backupCount_log_files_x_days
         )
 
         self.test_config()

atomicshop/wrappers/socketw/statistics_csv.py

@@ -1,6 +1,5 @@
 import datetime
 
-from ...print_api import print_api
 from ...file_io import csvs
 from ..loggingw import loggingw
 

{atomicshop-2.16.13.dist-info → atomicshop-2.16.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.16.13
+Version: 2.16.14
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.16.13.dist-info → atomicshop-2.16.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=nKRmwq7NbTn58KeTMLn39MOGpSUYRy9TXJGc5QuPXOg,124
+atomicshop/__init__.py,sha256=waCY7DPxgBrQX24BI-0hmphU84XoLtMKDMT9OE3ps6g,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -122,13 +122,13 @@ atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
 atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,2104
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/config_static.py,sha256=e7-tqQbt3sZ3Inqwyy4c-iE62Ldoa_QkAg-TUOwuzpE,7105
+atomicshop/mitm/config_static.py,sha256=ds31SXyOnOEvd7RAVWvw1o8MrQTVWWZCZeQX0wUptbM,7171
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
 atomicshop/mitm/connection_thread_worker.py,sha256=1MBpRoLpzWJMvxqQKizo6IVQ4XYsbKGsjxianNQLUlE,20051
 atomicshop/mitm/import_config.py,sha256=5peDr6cT0ZWK3J53yG-VEew77CKrvB88CphM10SQd3I,7868
-atomicshop/mitm/initialize_engines.py,sha256=F_FESrvTghEln-P9wesvXnr3_sxczYJBN6QtmQ3d2WE,8249
+atomicshop/mitm/initialize_engines.py,sha256=kBG8TBnyFuwlJ1uKaWDzc5AiZNpwdvouq2pr-PYrdEA,8349
 atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,1814
-atomicshop/mitm/mitm_main.py,sha256=UQ8vCHE83H5Q5Uffv3dIGCH8Buigq6FxSWgLm6_vRGc,20683
+atomicshop/mitm/mitm_main.py,sha256=N7ckWZhGkkIO2dJ7m7mnh_h7lQTihUeSAfzTTsHEKts,20903
 atomicshop/mitm/recs_files.py,sha256=btOuYQca4DuBOAKp9OY21HGjeEVOx9r_k-AnZOqs3Dk,3007
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
 atomicshop/mitm/statistic_analyzer.py,sha256=AzL9rQhg0tLJj33gZfxdwWghmbXGLh_HyMBDpzuBmsQ,24709
@@ -247,9 +247,9 @@ atomicshop/wrappers/fibratusw/install.py,sha256=PLVymDe0HuOvU0r2lje8BkQAgtiOWEeR
 atomicshop/wrappers/loggingw/consts.py,sha256=JWiUJEydjhwatBxtIJsGTmDUSTLbmIRidtR6qRLMaIY,1608
 atomicshop/wrappers/loggingw/filters.py,sha256=CMs5PAMb68zxJgBcQobaOFDG5kLJBOVYnoBHjDgksO8,2859
 atomicshop/wrappers/loggingw/formatters.py,sha256=7XUJvlB0CK4DCkEp8NTL0S0dkyrZD0UTADgEwkStKOY,5483
-atomicshop/wrappers/loggingw/handlers.py,sha256=yFYBeTkxnpmtlauoH3ZEFEHUYQYu9YL-ycd9sYTvOl4,16928
+atomicshop/wrappers/loggingw/handlers.py,sha256=_69ZtmZRUsdgL8Q1rh2X-a0ComDU9gg9v101ngbJcac,17436
 atomicshop/wrappers/loggingw/loggers.py,sha256=DHOOTAtqkwn1xgvLHSkOiBm6yFGNuQy1kvbhG-TDog8,2374
-atomicshop/wrappers/loggingw/loggingw.py,sha256=lo4OZPXCbYZi3GqpaaJSs9SOGFfqD2EgHzzTK7f5IR4,11275
+atomicshop/wrappers/loggingw/loggingw.py,sha256=BBQe_2i8otcbe0cZcAKd3tZ2D5XL3SPb_IWTXCepSxw,11595
 atomicshop/wrappers/loggingw/reading.py,sha256=tplnJlQ7RMxWv2s782tWGOo1C7WNemk2SRTZCCgD9J0,16474
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/infrastructure.py,sha256=tHqtt__yKGtj24CT5AIk0V0k9t1p_PjezFExXRmmmcA,1517
@@ -295,7 +295,7 @@ atomicshop/wrappers/socketw/accepter.py,sha256=hZZKVYlF3LOHQJsSIEKXZUf6QXXWm-Atq
 atomicshop/wrappers/socketw/base.py,sha256=evoOIxg5Xff3THJnrVX00D5HobaOpDp6_e_gso7TJmA,2191
 atomicshop/wrappers/socketw/certificator.py,sha256=3CpQKtcW68FSbH6LVSEZTqWBS6Yg_-3K0x4nFkId4UY,12236
 atomicshop/wrappers/socketw/creator.py,sha256=3_OraDkw2DAWZfoSdY3svCGMOIxpjLEEY7NxWd7M5P4,9873
-atomicshop/wrappers/socketw/dns_server.py,sha256=VIpz6cluQ53nZ14QGhnXU9zJqlcOa5fEZsHeKJWr9ec,45127
+atomicshop/wrappers/socketw/dns_server.py,sha256=53S52lkA9RWetNlee-mjt000OJW4Mi7Ktcru0WXrMZE,45504
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=_YMVxYhVlzjJpeOR36tphZ5QWeKYwk03Ilw0muCxDbg,5950
 atomicshop/wrappers/socketw/receiver.py,sha256=G3hDTacm7nwwUNHEbKZpxO0c8rHcl0NeKpZy7Xc6zpA,9008
@@ -305,11 +305,11 @@ atomicshop/wrappers/socketw/socket_client.py,sha256=FNmTt94YvjZP0X4RPb7icO3xD_nB
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=wAwyst8YdVyVfZfERav1A9_OnMJAiVBy-4uY0RpNqkU,6339
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=g7f_8RkW80EZeQWNTqGYnfrQkgAI56T3SwWybq7ZsXg,28521
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
-atomicshop/wrappers/socketw/statistics_csv.py,sha256=Jc0D12crkKRaqoCRQ-2Mz1zm6n4UUx9dXakf-N2TYWA,3065
+atomicshop/wrappers/socketw/statistics_csv.py,sha256=V_m1D0KpizQox3IEWp2AUcncwWy5kG25hbFrc-mBSJE,3029
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.13.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.13.dist-info/METADATA,sha256=2s0TVb_dZrMajZtHu9zT9kJVA7e0_U9-uBCFyPfVfmY,10503
-atomicshop-2.16.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.13.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.13.dist-info/RECORD,,
+atomicshop-2.16.14.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.14.dist-info/METADATA,sha256=V_qBUztY_EbQm-h-yHG_P1-KbkF1PpntRW34Q1zW07U,10503
+atomicshop-2.16.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.14.dist-info/RECORD,,