GUACAMOLE-611: Rename property defining tolerated auth providers to "skip-if-unavailable".
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/8fae19de Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/8fae19de Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/8fae19de Branch: refs/heads/master Commit: 8fae19dee9ba052cbbb5acbca7250ff605a4dd9f Parents: 5783144 Author: Michael Jumper <mjum...@apache.org> Authored: Sat Aug 25 13:20:38 2018 -0700 Committer: Michael Jumper <mjum...@apache.org> Committed: Sat Aug 25 13:20:38 2018 -0700 ---------------------------------------------------------------------- .../org/apache/guacamole/extension/ExtensionModule.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8fae19de/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java index c276cc1..05bdfc1 100644 --- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java @@ -93,11 +93,11 @@ public class ExtensionModule extends ServletModule { * providers that are not within this list will halt the authentication * process entirely. */ - private final StringSetProperty TOLERATE_INTERNAL_FAILURES = new StringSetProperty() { + private final StringSetProperty SKIP_IF_UNAVAILABLE = new StringSetProperty() { @Override public String getName() { - return "tolerate-internal-failures"; + return "skip-if-unavailable"; } }; @@ -379,13 +379,13 @@ public class ExtensionModule extends ServletModule { // Parse list of auth providers whose internal failures should be // tolerated try { - return environment.getProperty(TOLERATE_INTERNAL_FAILURES, Collections.<String>emptySet()); + return environment.getProperty(SKIP_IF_UNAVAILABLE, Collections.<String>emptySet()); } // Use empty set by default if property cannot be parsed catch (GuacamoleException e) { - logger.warn("The list of authentication providers specified via the \"{}\" property could not be parsed: {}", TOLERATE_INTERNAL_FAILURES.getName(), e.getMessage()); - logger.debug("Unable to parse \"{}\" property.", TOLERATE_INTERNAL_FAILURES.getName(), e); + logger.warn("The list of authentication providers specified via the \"{}\" property could not be parsed: {}", SKIP_IF_UNAVAILABLE.getName(), e.getMessage()); + logger.debug("Unable to parse \"{}\" property.", SKIP_IF_UNAVAILABLE.getName(), e); return Collections.<String>emptySet(); }
