You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kh...@apache.org on 2017/03/28 16:47:01 UTC
[33/35] geode git commit: remove duplicate block of code
remove duplicate block of code
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4f69cf96
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4f69cf96
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4f69cf96
Branch: refs/heads/feature/GEODE-2420
Commit: 4f69cf96f8ed6e18a00301628573493622cb2bbb
Parents: 3aa0d80
Author: Ken Howe <kh...@pivotal.io>
Authored: Mon Mar 27 15:52:20 2017 -0700
Committer: Ken Howe <kh...@pivotal.io>
Committed: Mon Mar 27 15:52:20 2017 -0700
----------------------------------------------------------------------
.../cli/commands/ExportLogsCommand.java | 23 --------------------
1 file changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/4f69cf96/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
index 9b05569..6e76da9 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java
@@ -96,14 +96,9 @@ public class ExportLogsCommand implements CommandMarker {
@CliOption(key = CliStrings.EXPORT_LOGS__STATSONLY, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.EXPORT_LOGS__STATSONLY__HELP) boolean statsOnly,
-<<<<<<< HEAD
@CliOption(key = CliStrings.EXPORT_LOGS__FILESIZELIMIT,
unspecifiedDefaultValue = CliStrings.EXPORT_LOGS__FILESIZELIMIT__UNSPECIFIED_DEFAULT,
specifiedDefaultValue = CliStrings.EXPORT_LOGS__FILESIZELIMIT__SPECIFIED_DEFAULT,
-=======
- @CliOption(key = CliStrings.EXPORT_LOGS__FILESIZELIMIT, unspecifiedDefaultValue = "false",
- specifiedDefaultValue = "true",
->>>>>>> first working filesize checks
help = CliStrings.EXPORT_LOGS__FILESIZELIMIT__HELP) String fileSizeLimit) {
Result result = null;
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
@@ -184,16 +179,12 @@ public class ExportLogsCommand implements CommandMarker {
ZipUtils.zipDirectory(exportedLogsDir, exportedLogsZipFile);
FileUtils.deleteDirectory(tempDir.toFile());
-<<<<<<< HEAD
// try {
isFileSizeCheckEnabledAndWithinLimit(parseFileSizeLimit(fileSizeLimit),
exportedLogsZipFile.toFile());
// } catch (IllegalArgumentException e) {
// return ResultBuilder.createUserErrorResult("TOO BIG: fileSizeLimit = " + fileSizeLimit);
// }
-=======
- checkOverDiskSpaceThreshold(parseFileSizeLimit(fileSizeLimit), exportedLogsZipFile.toFile());
->>>>>>> first working filesize checks
result = ResultBuilder.createInfoResult(exportedLogsZipFile.toString());
} catch (Exception ex) {
@@ -231,20 +222,6 @@ public class ExportLogsCommand implements CommandMarker {
}
/**
- * Returns file size limit in bytes
- */
- int parseFileSizeLimit(String fileSizeLimit) {
- if (StringUtils.isEmpty(fileSizeLimit)) {
- return 0;
- }
-
- int sizeLimit = parseSize(fileSizeLimit);
- int byteMultiplier = parseByteMultiplier(fileSizeLimit);
-
- return sizeLimit * byteMultiplier;
- }
-
- /**
* Throws IllegalArgumentException if file size is over fileSizeLimitBytes
* false == limit is zero
* true == file size is less than limit