diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-01-12 18:01:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-01-18 18:46:51 +0100 |
| commit | 575e52ac2b090fd194086e9c1c53bbf8055acbc2 (patch) | |
| tree | 0f07cf3eff0d1449ffd8334b8fe5e14b0dda7157 | |
| parent | 775203e52083235a067e7a737a75b24eae375afb (diff) | |
daemon: Always default to gzip for log compression.
* nix/libstore/globals.cc (Settings::Settings): Have 'logCompression'
default to COMPRESSION_GZIP unconditionally.
* gnu/services/base.scm (<guix-configuration>)[log-compression]: Default
to 'gzip.
* doc/guix.texi (Invoking guix-daemon, Base Services): Adjust accordingly.
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/services/base.scm | 2 | ||||
| -rw-r--r-- | nix/libstore/globals.cc | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index ea603ab56a..28eaf8338c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1705,7 +1705,7 @@ Compress build logs according to @var{type}, one of @code{gzip}, Unless @option{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}. To save space, the daemon automatically compresses -them with Bzip2 by default. +them with gzip by default. @item --discover[=yes|no] Whether to discover substitute servers on the local network using mDNS @@ -16623,7 +16623,7 @@ The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out. A value of zero disables the timeout. -@item @code{log-compression} (default: @code{'bzip2}) +@item @code{log-compression} (default: @code{'gzip}) The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index cd8d512edc..345e0ca0f7 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1566,7 +1566,7 @@ archive' public keys, with GUIX." (timeout guix-configuration-timeout ;integer (default 0)) (log-compression guix-configuration-log-compression - (default 'bzip2)) + (default 'gzip)) (discover? guix-configuration-discover? (default #f)) (extra-options guix-configuration-extra-options ;list of strings diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 0cc001fbe4..d4f9a46a74 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -45,11 +45,7 @@ Settings::Settings() useChroot = false; impersonateLinux26 = false; keepLog = true; -#if HAVE_BZLIB_H - logCompression = COMPRESSION_BZIP2; -#else logCompression = COMPRESSION_GZIP; -#endif maxLogSize = 0; cacheFailure = false; pollInterval = 5; |