Repository: kylin Updated Branches: refs/heads/master 6c298fac2 -> e8ed22309
KYLIN-1962 exclude from diagnosis tool Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e8ed2230 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e8ed2230 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e8ed2230 Branch: refs/heads/master Commit: e8ed223099fba4ace11aea62d7116f7b7004073d Parents: 6c298fa Author: lidongsjtu <lid...@apache.org> Authored: Wed Aug 17 22:30:36 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Wed Aug 17 22:30:36 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/tool/DiagnosisInfoCLI.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e8ed2230/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java index 89d3555..7b5eeaf 100644 --- a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java +++ b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java @@ -38,6 +38,7 @@ import org.apache.kylin.tool.util.ToolUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; public class DiagnosisInfoCLI extends AbstractInfoExtractor { @@ -161,13 +162,23 @@ public class DiagnosisInfoCLI extends AbstractInfoExtractor { public void run() { logger.info("Start to extract kylin conf files."); try { - FileUtils.copyDirectoryToDirectory(new File(ToolUtil.getConfFolder()), exportDir); + File destConfDir = new File(exportDir, "conf"); + FileUtils.forceMkdir(destConfDir); + File srcConfDir = new File(ToolUtil.getConfFolder()); + Preconditions.checkState(srcConfDir.exists(), "Cannot find config dir: " + srcConfDir.getAbsolutePath()); + File[] confFiles = srcConfDir.listFiles(); + if (confFiles != null) { + for (File confFile : confFiles) { + if (!KylinConfig.KYLIN_SECURITY_CONF_PROPERTIES_FILE.equals(confFile.getName())) { + FileUtils.copyFileToDirectory(confFile, destConfDir); + } + } + } } catch (Exception e) { logger.warn("Error in export conf.", e); } } }); - } // export client
