geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject geode git commit: GEODE-2765: change gfsh help to consistently use log4j levels
Date Tue, 11 Apr 2017 18:11:39 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2765 [created] 333d26c1d


GEODE-2765: change gfsh help to consistently use log4j levels


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/333d26c1
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/333d26c1
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/333d26c1

Branch: refs/heads/feature/GEODE-2765
Commit: 333d26c1d35901cdd240298143a3ea9fbea006cd
Parents: 8183b1f
Author: Kirk Lund <klund@apache.org>
Authored: Mon Apr 10 10:53:36 2017 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Mon Apr 10 14:01:33 2017 -0700

----------------------------------------------------------------------
 .../geode/management/internal/cli/i18n/CliStrings.java  | 11 +++++++----
 .../cli/commands/golden-help-offline.properties         | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/333d26c1/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index 67955dc..126eb47 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -75,6 +75,9 @@ import java.text.MessageFormat;
  */
 public class CliStrings {
 
+  private static final String LOG_LEVEL_VALUES =
+      "Possible values for log-level include: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL,
OFF.";
+
   /*-*************************************************************************
    *************                  T O P I C S                  ***************
    ***************************************************************************/
@@ -408,7 +411,7 @@ public class CliStrings {
           + DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT + ".";
   public static final String ALTER_RUNTIME_CONFIG__LOG__LEVEL = LOG_LEVEL;
   public static final String ALTER_RUNTIME_CONFIG__LOG__LEVEL__HELP =
-      "Log level. Valid values are: none, error, info, config , warning, severe, fine, finer
and finest.";
+      "Log level. " + LOG_LEVEL_VALUES;
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED =
       "enable-statistics";
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED__HELP =
@@ -1401,7 +1404,7 @@ public class CliStrings {
   public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
   public static final String EXPORT_LOGS__LOGLEVEL = LOG_LEVEL;
   public static final String EXPORT_LOGS__LOGLEVEL__HELP =
-      "Minimum level of log entries to export. Valid values are: fatal, error, warn, info,
debug, trace and all.  The default is \"ALL\".";
+      "Minimum level of log entries to export.  " + LOG_LEVEL_VALUES + "  The default is
ALL.";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL = "only-log-level";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL__HELP =
       "Whether to only include those entries that exactly match the --log-level specified.";
@@ -2371,7 +2374,7 @@ public class CliStrings {
       "Sets the list of Locators used by this Locator to join the appropriate Geode cluster.";
   public static final String START_LOCATOR__LOG_LEVEL = LOG_LEVEL;
   public static final String START_LOCATOR__LOG_LEVEL__HELP =
-      "Sets the level of output logged to the Locator log file.  Possible values for log-level
include: finest, finer, fine, config, info, warning, severe, none.";
+      "Sets the level of output logged to the Locator log file.  " + LOG_LEVEL_VALUES;
   public static final String START_LOCATOR__MCAST_ADDRESS = MCAST_ADDRESS;
   public static final String START_LOCATOR__MCAST_ADDRESS__HELP =
       "The IP address or hostname used to bind the UPD socket for multi-cast networking so
the Locator can communicate with other members in the Geode cluster using a common multicast
address and port.  If mcast-port is zero, then mcast-address is ignored.";
@@ -2525,7 +2528,7 @@ public class CliStrings {
       "Sets the number of seconds the server will wait for a locator to become available
during startup before giving up.";
   public static final String START_SERVER__LOG_LEVEL = LOG_LEVEL;
   public static final String START_SERVER__LOG_LEVEL__HELP =
-      "Sets the level of output logged to the Cache Server log file.  Possible values for
log-level include: finest, finer, fine, config, info, warning, severe, none.";
+      "Sets the level of output logged to the Cache Server log file.  " + LOG_LEVEL_VALUES;
   public static final String START_SERVER__MAXHEAP = "max-heap";
   public static final String START_SERVER__MAXHEAP__HELP =
       "Maximum size of the heap in the same format as the JVM -Xmx parameter.";

http://git-wip-us.apache.org/repos/asf/geode/blob/333d26c1/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
index af6b4bf..eb0a719 100644
--- a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
@@ -229,8 +229,8 @@ PARAMETERS\n\
 \ \ \ \ \ \ \ \ Log file size limit. Valid values are (in megabytes): 0 - 1000000.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ log-level\n\
-\ \ \ \ \ \ \ \ Log level. Valid values are: none, error, info, config , warning, severe,
fine, finer and\n\
-\ \ \ \ \ \ \ \ finest.\n\
+\ \ \ \ \ \ \ \ Log level. Possible values for log-level include: ALL, TRACE, DEBUG, INFO,
WARN, ERROR,\n\
+\ \ \ \ \ \ \ \ FATAL, OFF.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ statistic-archive-file\n\
 \ \ \ \ \ \ \ \ File to which the statistics will be written.\n\
@@ -1485,8 +1485,8 @@ PARAMETERS\n\
 \ \ \ \ \ \ \ \ Name/Id of the member whose log files will be exported.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ log-level\n\
-\ \ \ \ \ \ \ \ Minimum level of log entries to export. Valid values are: fatal, error, warn,
info, debug,\n\
-\ \ \ \ \ \ \ \ trace and all.  The default is "ALL".\n\
+\ \ \ \ \ \ \ \ Minimum level of log entries to export.  Possible values for log-level include:
ALL, TRACE,\n\
+\ \ \ \ \ \ \ \ DEBUG, INFO, WARN, ERROR, FATAL, OFF.  The default is ALL.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ \ \ \ \ Default (if the parameter is not specified): ALL\n\
 \ \ \ \ only-log-level\n\
@@ -2472,7 +2472,7 @@ PARAMETERS\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ log-level\n\
 \ \ \ \ \ \ \ \ Sets the level of output logged to the Locator log file.  Possible values
for log-level\n\
-\ \ \ \ \ \ \ \ include: finest, finer, fine, config, info, warning, severe, none.\n\
+\ \ \ \ \ \ \ \ include: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ mcast-address\n\
 \ \ \ \ \ \ \ \ The IP address or hostname used to bind the UPD socket for multi-cast networking
so the\n\
@@ -2682,7 +2682,7 @@ PARAMETERS\n\
 \ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
 \ \ \ \ log-level\n\
 \ \ \ \ \ \ \ \ Sets the level of output logged to the Cache Server log file.  Possible values
for\n\
-\ \ \ \ \ \ \ \ log-level include: finest, finer, fine, config, info, warning, severe, none.\n\
+\ \ \ \ \ \ \ \ log-level include: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF.\n\
 \ \ \ \ \ \ \ \ Required: false\n\
 \ \ \ \ max-connections\n\
 \ \ \ \ \ \ \ \ Sets the maxium number of client connections allowed. When the maximum is
reached the cache\n\


Mime
View raw message