mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-26 07:53:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7055 from ThomasWaldmann/borg-lock-wait-env-var

Browse source 
BORG_LOCK_WAIT=n env var to set default for --lock-wait option, fixes #5279
This commit is contained in:
TW 2022-09-27 19:41:14 +02:00 committed by GitHub
commit 58c375678a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/usage/general/environment.rst.inc
View file

@ -43,6 +43,9 @@ General:
So, if you have a all-zero MAC address or other reasons to better externally control the host id, just set this So, if you have a all-zero MAC address or other reasons to better externally control the host id, just set this
environment variable to a unique value. If all your FQDNs are unique, you can just use the FQDN. If not, environment variable to a unique value. If all your FQDNs are unique, you can just use the FQDN. If not,
use fqdn@uniqueid. use fqdn@uniqueid.
BORG_LOCK_WAIT
You can set the default value for the ``--lock-wait`` option with this, so
you do not need to give it as a commandline option.
BORG_LOGGING_CONF BORG_LOGGING_CONF
When set, use the given filename as INI_-style logging configuration. When set, use the given filename as INI_-style logging configuration.
A basic example conf can be found at ``docs/misc/logging.conf``. A basic example conf can be found at ``docs/misc/logging.conf``.

2
src/borg/archiver/_common.py
View file

@ -468,7 +468,7 @@ def define_common_options(add_common_option):
metavar="SECONDS", metavar="SECONDS",
dest="lock_wait", dest="lock_wait",
type=int, type=int,
default=1, default=int(os.environ.get("BORG_LOCK_WAIT", 1)),
help="wait at most SECONDS for acquiring a repository/cache lock (default: %(default)d).", help="wait at most SECONDS for acquiring a repository/cache lock (default: %(default)d).",
) )
add_common_option( add_common_option(