Skip to content

Commit 4e86cdd

Browse files
committed
Always make errors red and warnings orange
1 parent ed60961 commit 4e86cdd

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

rsync_time_machine.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ def _red(message: str) -> str:
5252
return f"\033[91m{message}\033[0m"
5353

5454

55-
def _log(message: str, level: str = "info") -> None:
55+
def _orange(message: str) -> str:
56+
"""Return an orange message."""
57+
return f"\033[33m{message}\033[0m"
58+
59+
60+
def log(message: str, level: str = "info") -> None:
5661
"""Log a message with the specified log level."""
5762
levels = {"info": "", "warning": "[WARNING] ", "error": "[ERROR] "}
5863
output = sys.stderr if level in {"warning", "error"} else sys.stdout
@@ -61,17 +66,17 @@ def _log(message: str, level: str = "info") -> None:
6166

6267
def log_info(message: str) -> None:
6368
"""Log an info message to stdout."""
64-
_log(message, "info")
69+
log(message, "info")
6570

6671

6772
def log_warn(message: str) -> None:
6873
"""Log a warning message to stderr."""
69-
_log(message, "warning")
74+
log(_orange(message), "warning")
7075

7176

7277
def log_error(message: str) -> None:
7378
"""Log an error message to stderr."""
74-
_log(message, "error")
79+
log(_red(_bold(message)), "error")
7580

7681

7782
def log_info_cmd(message: str, ssh: Optional[SSH]) -> None:
@@ -438,7 +443,6 @@ def check_dest_is_backup_folder(
438443
_bold(_green(f'mkdir -p -- "{dest_folder}" ; touch "{marker_path}"')),
439444
ssh,
440445
)
441-
log_info("")
442446
sys.exit(1)
443447

444448

@@ -638,15 +642,11 @@ def check_rsync_errors(
638642
log_data = f.read()
639643
if "rsync error:" in log_data:
640644
log_error(
641-
_magenta(
642-
f"Rsync reported an error. Run this command for more details: grep -E 'rsync:|rsync error:' '{log_file}'",
643-
),
645+
f"Rsync reported an error. Run this command for more details: grep -E 'rsync:|rsync error:' '{log_file}'",
644646
)
645647
elif "rsync:" in log_data:
646648
log_warn(
647-
_magenta(
648-
f"Rsync reported a warning. Run this command for more details: grep -E 'rsync:|rsync error:' '{log_file}'",
649-
),
649+
f"Rsync reported a warning. Run this command for more details: grep -E 'rsync:|rsync error:' '{log_file}'",
650650
)
651651
else:
652652
log_info(_magenta("Backup completed without errors."))

0 commit comments

Comments
 (0)