git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89785 from buckley310/logstash

logstash: fix support for multiple plugin paths

commitd8e671676d91fa9d3ef64b69ba7680d07d79f7a7 authorLassulus <github@lassul.us> dateSat 22 Aug 2020, 14:07 (6 years ago) parenta778e66ebc2067
1 file changed+1−5
nixos/modules/services/logging/logstash.nix+1−5
nixos/modules/services/logging/logstash.nix+1−5
@@ -4,13 +4,9 @@ with lib;
44
55let
66 cfg = config.services.logstash;
7− pluginPath = lib.concatStringsSep ":" cfg.plugins;
8− havePluginPath = lib.length cfg.plugins > 0;
97 ops = lib.optionalString;
108 verbosityFlag = "--log.level " + cfg.logLevel;
119
12− pluginsPath = "--path.plugins ${pluginPath}";
13−
1410 logstashConf = pkgs.writeText "logstash.conf" ''
1511 input {
1612 ${cfg.inputConfig}
@@ -173,7 +169,7 @@ in
173169 ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [
174170 "${cfg.package}/bin/logstash"
175171 "-w ${toString cfg.filterWorkers}"
176− (ops havePluginPath pluginsPath)
172+ (concatMapStringsSep " " (x: "--path.plugins ${x}") cfg.plugins)
177173 "${verbosityFlag}"
178174 "-f ${logstashConf}"
179175 "--path.settings ${logstashSettingsDir}"