borgmatic-collective/borgmatic
borgmatic-collective
/
borgmatic
14
58
Fork 41
Code Issues 53 Pull Requests 2 Actions Packages Releases 122 Activity

Add option to disable syslog output #675

Merged
witten merged 11 commits from Soumik_Dutta/borgmatic:feat484-option-to-disable-syslog into main 2023-05-30 20:03:57 +00:00
Conversation 14 Commits 11 Files Changed 8 +5 -6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7f81d538d - Show all commits

6
borgmatic/commands/arguments.py
View File

@ -154,21 +154,21 @@ def make_parsers():
type=int,
choices=range(-2, 3),
default=0,
help='Display verbose progress to the console (from disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2)',
help='Display verbose progress to the console (disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2)',
Soumik_Dutta marked this conversation as resolved Outdated
witten commented 2023-05-04 03:15:54 +00:00
Outdated
Review
Copy Link

At this point, it might be clearer to change this help to something like:

Display verbose progress to the console (disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2)

Or even something like:

Display verbose progress to the console at the requested level: -2 (disabled), -1 (errors only), 0 (default), 1 (some), or 2 (lots)

At this point, it might be clearer to change this help to something like: `Display verbose progress to the console (disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2)` Or even something like: `Display verbose progress to the console at the requested level: -2 (disabled), -1 (errors only), 0 (default), 1 (some), or 2 (lots)`
witten commented 2023-05-26 18:57:24 +00:00
Outdated
Review
Copy Link

Maybe remove "from" here and in the other helps, as it's no longer "from"/"to".

Maybe remove "from" here and in the other helps, as it's no longer "from"/"to".
)
global_group.add_argument(
'--syslog-verbosity',
type=int,
choices=range(-2, 3),
Soumik_Dutta marked this conversation as resolved Outdated
witten commented 2023-04-13 05:07:23 +00:00
Outdated
Review
Copy Link

For consistency, it would be good to add -2 support to the other verbosity flags as well. (Let me know if you disagree.)

For consistency, it would be good to add `-2` support to the other verbosity flags as well. (Let me know if you disagree.)
Soumik_Dutta commented 2023-04-13 06:58:57 +00:00
Outdated
Review
Copy Link

I was not sure initially about the scope of adding another global verbosity level so I tried to minimize the affected code.

Though I agree that it will be good for consistency and I am working on it. Otherwise we will have to document around this.

I was not sure initially about the scope of adding another global verbosity level so I tried to minimize the affected code. Though I agree that it will be good for consistency and I am working on it. Otherwise we will have to document around this.
witten commented 2023-04-13 16:03:30 +00:00
Outdated
Review
Copy Link

I'll admit I haven't thought through the scope implications, so if it grows too large, please let me know!

I'll admit I haven't thought through the scope implications, so if it grows too large, please let me know!
default=0,
help='Log verbose progress to syslog (from disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2). Ignored when console is interactive or --log-file is given',
help='Log verbose progress to syslog (disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2). Ignored when console is interactive or --log-file is given',
)
global_group.add_argument(
'--log-file-verbosity',
type=int,
choices=range(-2, 3),
default=0,
help='Log verbose progress to log file (from disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2). Only used when --log-file is given',
help='Log verbose progress to log file (disabled, errors only, default, some, or lots: -2, -1, 0, 1, or 2). Only used when --log-file is given',
)
global_group.add_argument(
'--monitoring-verbosity',

1
tests/unit/commands/test_borgmatic.py
View File

@ -175,7 +175,6 @@ def test_run_configuration_does_not_call_monitoring_hooks_if_monitoring_hooks_ar
flexmock(module.dispatch).should_receive('call_hooks').never()
flexmock(module).should_receive('run_actions').and_return([])
flexmock(module.dispatch).should_receive('call_hooks').never()
Soumik_Dutta marked this conversation as resolved
witten commented 2023-05-26 18:56:25 +00:00
Review
Copy Link

This line is duplicative of the earlier call two lines up. The first one is sufficient to assert that call_hooks() is never called.

This line is duplicative of the earlier call two lines up. The first one is sufficient to assert that `call_hooks()` is never called.
config = {'location': {'repositories': [{'path': 'foo'}]}}
arguments = {'global': flexmock(monitoring_verbosity=-2, dry_run=False), 'create': flexmock()}

4
tests/unit/test_logger.py
View File

@ -314,7 +314,7 @@ def test_configure_logging_skips_log_file_if_log_file_logging_is_disabled():
flexmock(module.logging).should_receive('basicConfig').with_args(
level=logging.INFO, handlers=tuple
)
flexmock(module.os.path).should_receive('exists').with_args('/dev/log').never()
flexmock(module.os.path).should_receive('exists').never()
flexmock(module.logging.handlers).should_receive('SysLogHandler').never()
flexmock(module.logging.handlers).should_receive('WatchedFileHandler').never()
@ -335,7 +335,7 @@ def test_configure_logging_to_log_file_instead_of_syslog():
flexmock(module.logging).should_receive('basicConfig').with_args(
level=logging.DEBUG, handlers=tuple
)
flexmock(module.os.path).should_receive('exists').with_args('/dev/log').and_return(True)
flexmock(module.os.path).should_receive('exists').never()
flexmock(module.logging.handlers).should_receive('SysLogHandler').never()
file_handler = logging.handlers.WatchedFileHandler('/tmp/logfile')
flexmock(module.logging.handlers).should_receive('WatchedFileHandler').with_args(