Skip to content

Commit

Permalink
pylint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
boazhaim committed Nov 7, 2024
1 parent 5316908 commit fdfe919
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
from loganalyze.log_analyzers.console_log_analyzer import ConsoleLogAnalyzer
from loganalyze.log_analyzers.rest_api_log_analyzer import RestApiAnalyzer
from loganalyze.log_analyzers.link_flapping_analyzer import LinkFlappingAnalyzer
from loganalyze.log_analyzers.ibdiagnet_log_analyzer import IBDIAGNETLogAnalyzer

from loganalyze.pdf_creator import PDFCreator
from loganalyze.utils.common import delete_files_by_types
Expand Down Expand Up @@ -392,9 +391,9 @@ def create_analyzer(parsed_args, full_extracted_logs_list,
# Clean some unended files created during run
files_types_to_delete = set()
files_types_to_delete.add("png") #png images created for PDF report
# files_types_to_delete.add("log") #logs taken from the logs
# files_types_to_delete.add("csv") #tmp csv + telemetery samples
# files_types_to_delete.add("gz") #gz files of logs and samples
files_types_to_delete.add("log") #logs taken from the logs
files_types_to_delete.add("csv") #tmp csv + telemetery samples
files_types_to_delete.add("gz") #gz files of logs and samples
delete_files_by_types(args.destination, files_types_to_delete)

except Exception as exc:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

from loganalyze.log_parsing.base_regex import RegexAndHandlers

ITERATION_TIME_REGEX = re.compile(r"^\[ExportAPI_STATS\] Iteration time\: ([\d\.]+) sec \@ \[([\d\-]+ [\d\:\.]+)\]$")
ITERATION_TIME_REGEX = re.compile(r"^\[ExportAPI_STATS\] Iteration time"
r"\: ([\d\.]+) sec \@ \[([\d\-]+ [\d\:\.]+)\]$")

TIMEOUT_DUMP_CORE_REGEX = re.compile(r"^timeout: the monitored command dumped core$")

Expand All @@ -28,7 +29,7 @@ def iteration_time(match: Match):
timestamp = match.group(2)
return ("iteration_time", timestamp, iteration_time_sec, None)

def timeout_dump_core(match: Match):
def timeout_dump_core(_: Match):
return ("timeout_dump_core", None, None, None)

def total_switch_ports(match: Match):
Expand All @@ -37,19 +38,21 @@ def total_switch_ports(match: Match):
return ("total_switch_ports", None, total_switches, total_ports)

def collectx_version(match:Match):
collectx_version = match.group(1)
return ("collectx_version", None, collectx_version, None)
collectx_version_str = match.group(1)
return ("collectx_version", None, collectx_version_str, None)

ibdiagnet2_headers = ("type", "timestamp", "data", "extra")

ibdiagnet2_primary_log_regex_cls = RegexAndHandlers("ufm_logs_ibdiagnet2_port_counters.log", ibdiagnet2_headers)
ibdiagnet2_secondary_log_regex_cls = RegexAndHandlers("secondary_telemetry_ibdiagnet2_port_counters.log", ibdiagnet2_headers)
ibdiagnet2_primary_log_regex_cls = \
RegexAndHandlers("ufm_logs_ibdiagnet2_port_counters.log", ibdiagnet2_headers)
ibdiagnet2_secondary_log_regex_cls = \
RegexAndHandlers("secondary_telemetry_ibdiagnet2_port_counters.log", ibdiagnet2_headers)

regex_funcs_map = {ITERATION_TIME_REGEX: iteration_time,
TIMEOUT_DUMP_CORE_REGEX:timeout_dump_core,
TOTAL_SWITCH_PORTS_REGEX: total_switch_ports,
COLLECTX_VERSION_REGEX: collectx_version}

for regex in regex_funcs_map:
ibdiagnet2_primary_log_regex_cls.add_regex(regex, regex_funcs_map[regex])
ibdiagnet2_secondary_log_regex_cls.add_regex(regex, regex_funcs_map[regex])
for regex, regex_func in regex_funcs_map.items():
ibdiagnet2_primary_log_regex_cls.add_regex(regex, regex_func)
ibdiagnet2_secondary_log_regex_cls.add_regex(regex, regex_func)

0 comments on commit fdfe919

Please sign in to comment.