about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2020-05-14 08:34:44 +0200
committerGitHub <noreply@github.com>2020-05-14 08:34:44 +0200
commit85a05878846b75254f97b8690c18a470cfe982f0 (patch)
tree53ef0deed5726f7851f22acb0a8493eda8193627 /nixos
parentce9ed9baed6e8761ac83e5c86f340195bc856395 (diff)
parent084bd32bad6223882d8f13b48a83b96e8c6a151f (diff)
downloadnixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar.gz
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar.bz2
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar.lz
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar.xz
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.tar.zst
nixlib-85a05878846b75254f97b8690c18a470cfe982f0.zip
Merge pull request #87219 from serokell/kirelagin/postgres-no-time
postgres: Do not log timestamp
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/databases/postgresql.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 93f5c1ca5f55..982480fbd99c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -17,6 +17,7 @@ let
       hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}'
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'stderr'
+      log_line_prefix = '${cfg.logLinePrefix}'
       listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
       port = ${toString cfg.port}
       ${cfg.extraConfig}
@@ -186,6 +187,17 @@ in
         '';
       };
 
+      logLinePrefix = mkOption {
+        type = types.str;
+        default = "[%p] ";
+        example = "%m [%p] ";
+        description = ''
+          A printf-style string that is output at the beginning of each log line.
+          Upstream default is <literal>'%m [%p] '</literal>, i.e. it includes the timestamp. We do
+          not include the timestamp, because journal has it anyway.
+        '';
+      };
+
       extraPlugins = mkOption {
         type = types.listOf types.path;
         default = [];