paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

log-search: Factor out nginx date conversion.

Browse Source
This commit is contained in:
Alex Vandiver
2024-02-26 15:30:50 +00:00
committed by Tim Abbott
parent bdc210702c
commit 281b74a264
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/log-search
View File

@@ -272,6 +272,14 @@ def parse_logfile_names(args: argparse.Namespace) -> List[str]:
return logfile_names return logfile_names
month_name_to_no_lookup = {v: f"{k:02d}" for k, v in enumerate(calendar.month_abbr)}
def convert_from_nginx_date(date: str) -> str:
day_of_month, month_abbr, year = date.split("/")
return f"{year}-{month_name_to_no_lookup[month_abbr]}-{day_of_month}"
def parse_filters( def parse_filters(
args: argparse.Namespace, args: argparse.Namespace,
) -> Tuple[Set[FilterType], List[FilterFunc]]: ) -> Tuple[Set[FilterType], List[FilterFunc]]:
@@ -385,7 +393,6 @@ def passes_filters(
last_match_end: Optional[datetime] = None last_match_end: Optional[datetime] = None
month_lookup = {v: f"{k:02d}" for k, v in enumerate(calendar.month_abbr)}
def print_line( def print_line(
@@ -401,8 +408,7 @@ def print_line(
return return
if args.nginx: if args.nginx:
day_of_month, month_abbr, year = match["date"].split("/") date = convert_from_nginx_date(match["date"])
date = f"{year}-{month_lookup[month_abbr]}-{day_of_month}"
else: else:
date = match["date"] date = match["date"]
if args.all_logs or args.log_files is not None and args.log_files > 1: if args.all_logs or args.log_files is not None and args.log_files > 1: