GEODE-2267: add validation to the arguments and include export stats …

…in the command * use the config to determine where the logs and stats are
glukin · Mar 4, 2017 · bf78817 · bf78817
1 parent 92582fb
commit bf78817
Show file tree

Hide file tree

Showing 43 changed files with 1,434 additions and 943 deletions.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireLevel.java b/geode-core/src/main/java/org/apache/geode/internal/logging/GemFireLevel.java
@@ -14,13 +14,15 @@
  */
 package org.apache.geode.internal.logging;
 
-import java.util.logging.Level;
-
 import org.apache.geode.i18n.LogWriterI18n;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
+import java.util.logging.Level;
+
 /**
  * Extension that adds ERROR to the standard JDK logging level class.
+ * 
+ * @deprecated use log4j level
  */
 public class GemFireLevel extends Level {
   private static final long serialVersionUID = -8123818329485173242L;

diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java b/geode-core/src/main/java/org/apache/geode/internal/logging/InternalLogWriter.java
@@ -33,7 +33,10 @@
  * <li>{@link #SEVERE_LEVEL}
  * <li>{@link #NONE_LEVEL}
  * </ol>
+ * 
+ * @deprecated use log4j api instead
  */
+@Deprecated
 public interface InternalLogWriter extends LogWriter, LogWriterI18n {
 
   /**

diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java b/geode-core/src/main/java/org/apache/geode/internal/logging/LogService.java
@@ -14,10 +14,12 @@
  */
 package org.apache.geode.internal.logging;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
+import org.apache.geode.internal.logging.log4j.AppenderContext;
+import org.apache.geode.internal.logging.log4j.ConfigLocator;
+import org.apache.geode.internal.logging.log4j.Configurator;
+import org.apache.geode.internal.logging.log4j.FastLogger;
+import org.apache.geode.internal.logging.log4j.LogWriterLogger;
+import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -29,12 +31,9 @@
 import org.apache.logging.log4j.core.lookup.StrSubstitutor;
 import org.apache.logging.log4j.status.StatusLogger;
 
-import org.apache.geode.internal.logging.log4j.AppenderContext;
-import org.apache.geode.internal.logging.log4j.ConfigLocator;
-import org.apache.geode.internal.logging.log4j.Configurator;
-import org.apache.geode.internal.logging.log4j.FastLogger;
-import org.apache.geode.internal.logging.log4j.LogWriterLogger;
-import org.apache.geode.internal.logging.log4j.message.GemFireParameterizedMessageFactory;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
 
 /**
  * Centralizes log configuration and initialization.
@@ -47,6 +46,7 @@ public class LogService extends LogManager {
   public static final String BASE_LOGGER_NAME = "org.apache.geode";
   public static final String MAIN_LOGGER_NAME = "org.apache.geode";
   public static final String SECURITY_LOGGER_NAME = "org.apache.geode.security";
+  public static final String DEFAULT_LOG_LEVEL = "INFO";
 
   public static final String GEODE_VERBOSE_FILTER = "{GEODE_VERBOSE}";
   public static final String GEMFIRE_VERBOSE_FILTER = "{GEMFIRE_VERBOSE}";

diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveHandler.java
@@ -383,7 +383,7 @@ private void changeArchiveFile(File newFile, boolean resetHandler, long nanosTim
       }
       try {
         StatArchiveDescriptor archiveDescriptor = new StatArchiveDescriptor.Builder()
-            .setArchiveName(newFile.getPath()).setSystemId(this.config.getSystemId())
+            .setArchiveName(newFile.getAbsolutePath()).setSystemId(this.config.getSystemId())
             .setSystemStartTime(this.config.getSystemStartTime())
             .setSystemDirectoryPath(this.config.getSystemDirectoryPath())
             .setProductDescription(this.config.getProductDescription()).build();

diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java
@@ -32,24 +32,18 @@ public interface CliAroundInterceptor {
   /**
    * called by the OperationInvoker before the command is executed
    */
-  default public Result preExecution(GfshParseResult parseResult) {
+  default Result preExecution(GfshParseResult parseResult) {
     return ResultBuilder.createInfoResult("");
   }
 
-  @Deprecated
-  default public Result postExecution(GfshParseResult parseResult, Result commandResult) {
-    return commandResult;
-  }
-
   /**
    * called by the OperationInvoker after the command is executed
    * 
    * @param tempFile: if the command's isFileDownloadOverHttp is true, the is the File downloaded
    *        after the http response is processed.
    */
-  default public Result postExecution(GfshParseResult parseResult, Result commandResult,
-      Path tempFile) {
-    return postExecution(parseResult, commandResult);
+  default Result postExecution(GfshParseResult parseResult, Result commandResult, Path tempFile) {
+    return commandResult;
   }
 
 }
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandRequest.java
@@ -40,20 +40,22 @@ public class CommandRequest {
 
   private final Map<String, String> customParameters = new HashMap<String, String>();
   private final Map<String, String> env;
-  private boolean downloadFile = false;
+  private final boolean downloadFile;
 
   private String customInput;
 
   public CommandRequest(final Map<String, String> env) {
     this.env = env;
     this.fileData = null;
     this.parseResult = null;
+    downloadFile = false;
   }
 
   public CommandRequest(final Map<String, String> env, final byte[][] fileData) {
     this.env = env;
     this.fileData = fileData;
     this.parseResult = null;
+    downloadFile = false;
   }
 
   public CommandRequest(final GfshParseResult parseResult, final Map<String, String> env) {
@@ -69,9 +71,7 @@ public CommandRequest(final GfshParseResult parseResult, final Map<String, Strin
     this.parseResult = parseResult;
 
     CliMetaData metaData = parseResult.getMethod().getDeclaredAnnotation(CliMetaData.class);
-    if (metaData != null && metaData.isFileDownloadOverHttp()) {
-      downloadFile = true;
-    }
+    this.downloadFile = (metaData != null && metaData.isFileDownloadOverHttp());
   }
 
   public String getName() {

diff --git a/...-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java b/...-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigCommands.java
@@ -51,6 +51,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -500,7 +501,7 @@ public Result preExecution(GfshParseResult parseResult) {
     }
 
     @Override
-    public Result postExecution(GfshParseResult parseResult, Result commandResult) {
+    public Result postExecution(GfshParseResult parseResult, Result commandResult, Path tempFile) {
       if (commandResult.hasIncomingFiles()) {
         try {
           commandResult.saveIncomingFiles(saveDirString);

diff --git a/...-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/...-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -340,10 +340,5 @@ public Result preExecution(GfshParseResult parseResult) {
 
       return fileResult;
     }
-
-    @Override
-    public Result postExecution(GfshParseResult parseResult, Result commandResult) {
-      return null;
-    }
   }
 }
diff --git a/...ache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java b/...ache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java
@@ -245,7 +245,7 @@ public Result preExecution(GfshParseResult parseResult) {
     }
 
     @Override
-    public Result postExecution(GfshParseResult parseResult, Result commandResult) {
+    public Result postExecution(GfshParseResult parseResult, Result commandResult, Path tempFile) {
       if (commandResult.hasIncomingFiles()) {
         try {
           commandResult.saveIncomingFiles(System.getProperty("user.dir"));
@@ -293,11 +293,6 @@ public Result preExecution(GfshParseResult parseResult) {
 
       return fileResult;
     }
-
-    @Override
-    public Result postExecution(GfshParseResult parseResult, Result commandResult) {
-      return null;
-    }
   }
 
 }