Merge pull request #27700 from joelthompson/exhibitor

exhibitor: Fix bug with automatic instance management
This commit is contained in:
Daniel Peebles 2017-07-28 15:58:43 -04:00 committed by GitHub
commit 8d8eae163f

View File

@ -15,9 +15,12 @@ let
election-port=${toString cfg.zkElectionPort} election-port=${toString cfg.zkElectionPort}
cleanup-period-ms=${toString cfg.zkCleanupPeriod} cleanup-period-ms=${toString cfg.zkCleanupPeriod}
servers-spec=${concatStringsSep "," cfg.zkServersSpec} servers-spec=${concatStringsSep "," cfg.zkServersSpec}
auto-manage-instances=${lib.boolToString cfg.autoManageInstances} auto-manage-instances=${toString cfg.autoManageInstances}
${cfg.extraConf} ${cfg.extraConf}
''; '';
# NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended.
# Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false)
# will operate in the same fashion as a 0.
configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig; configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
cliOptionsCommon = { cliOptionsCommon = {
configtype = cfg.configType; configtype = cfg.configType;