psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into main
Some checks are pending
build / test (push) Waiting to run
Details
build / docs (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
pswilde 2024-06-26 19:58:56 +00:00
commit d18cb89493
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -1,5 +1,6 @@
1.8.13.dev0 1.8.13.dev0
* #886: Fix PagerDuty hook traceback with Python < 3.10. * #886: Fix a PagerDuty hook traceback with Python < 3.10.
* #889: Fix the Healthchecks ping body size limit, restoring it to the documented 100,000 bytes.
1.8.12 1.8.12
* #817: Add a "--max-duration" flag to the "check" action and a "max_duration" option to the * #817: Add a "--max-duration" flag to the "check" action and a "max_duration" option to the

2
borgmatic/hooks/healthchecks.py
View file

@ -15,7 +15,7 @@ MONITOR_STATE_TO_HEALTHCHECKS = {
monitor.State.LOG: 'log', monitor.State.LOG: 'log',
} }
DEFAULT_PING_BODY_LIMIT_BYTES = 1500 DEFAULT_PING_BODY_LIMIT_BYTES = 100000
HANDLER_IDENTIFIER = 'healthchecks' HANDLER_IDENTIFIER = 'healthchecks'

12
docs/how-to/develop-on-borgmatic.md
View file

@ -102,9 +102,9 @@ and depend on containers for runtime dependencies. These tests do run on the
continuous integration (CI) server, and running them on your developer machine continuous integration (CI) server, and running them on your developer machine
is the closest thing to dev-CI parity. is the closest thing to dev-CI parity.
If you would like to run the full test suite, first install Docker (or Podman; If you would like to run the end-to-end tests, first install Docker (or
see below) and [Docker Compose](https://docs.docker.com/compose/install/). Podman; see below) and [Docker
Then run: Compose](https://docs.docker.com/compose/install/). Then run:
```bash ```bash
scripts/run-end-to-end-tests scripts/run-end-to-end-tests
@ -152,12 +152,14 @@ the following deviations from it:
* In general, spell out words in variable names instead of shortening them. * In general, spell out words in variable names instead of shortening them.
So, think `index` instead of `idx`. There are some notable exceptions to So, think `index` instead of `idx`. There are some notable exceptions to
this though (like `config`). this though (like `config`).
* Favor blank lines around `if` statements, `return`s, logical code groupings,
etc. Readability is more important than packing the code tightly.
borgmatic code uses the [Black](https://black.readthedocs.io/en/stable/) code borgmatic code uses the [Black](https://black.readthedocs.io/en/stable/) code
formatter, the [Flake8](http://flake8.pycqa.org/en/latest/) code checker, and formatter, the [Flake8](http://flake8.pycqa.org/en/latest/) code checker, and
the [isort](https://github.com/timothycrosley/isort) import orderer, so the [isort](https://github.com/timothycrosley/isort) import orderer, so
certain code style requirements will be enforced when running automated tests. certain code style requirements are enforced when running automated tests. See
See the Black, Flake8, and isort documentation for more information. the Black, Flake8, and isort documentation for more information.
## Continuous integration ## Continuous integration