summary refs log tree commit diff
path: root/nixos/modules/services/databases
diff options
context:
space:
mode:
authorKirill Elagin <kirelagin@gmail.com>2020-05-08 00:11:38 +0300
committerKirill Elagin <kirelagin@gmail.com>2020-05-08 00:13:20 +0300
commit652958eefa4b2cfc275422740190dfd803b2f19f (patch)
tree4dc46262dae20b1a9fd7639aee5a3da3da9648fc /nixos/modules/services/databases
parent2f0ee4bd0bc34e608540c7193a53af314c0cf1da (diff)
downloadnixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar.gz
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar.bz2
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar.lz
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar.xz
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.tar.zst
nixpkgs-652958eefa4b2cfc275422740190dfd803b2f19f.zip
postgres: Do not log timestamp
By default, postgres prefixes each log line with a timestamp. On NixOS
logs are written to journal anyway, so they include an external
timestamp, so the timestamp ends up being printed twice, which clutters
the log.

* Add a module option to change the log prefix.
* Set it to upstream default sans timestamp.
Diffstat (limited to 'nixos/modules/services/databases')
-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 0b79a996dc7..269510036a6 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}
@@ -192,6 +193,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 '%m [%p] ', 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 = [];