0003549: Add log files to snapshot as last operation

JumpMind · May 7, 2018 · ac02e7b · ac02e7b
1 parent 09eb93a
commit ac02e7b
Showing 1 changed file with 46 additions and 46 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/util/SnapshotUtil.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/util/SnapshotUtil.java
@@ -110,52 +110,6 @@ public static File createSnapshot(ISymmetricEngine engine) {
         tmpDir.mkdirs();
         log.info("Creating snapshot file in " + tmpDir.getAbsolutePath());
 
-        File logDir = null;
-
-        String parameterizedLogDir = parameterService.getString("server.log.dir");
-        if (isNotBlank(parameterizedLogDir)) {
-            logDir = new File(parameterizedLogDir);
-        }
-
-        if (logDir != null && logDir.exists()) {
-            log.info("Using server.log.dir setting as the location of the log files");
-        } else {
-            logDir = new File("logs");
-
-            if (!logDir.exists()) {
-                Map<File, Layout> matches = findSymmetricLogFile();
-                if (matches != null && matches.size() == 1) {
-                    logDir = matches.keySet().iterator().next().getParentFile();
-                }
-            }
-
-            if (!logDir.exists()) {
-                logDir = new File("../logs");
-            }
-
-            if (!logDir.exists()) {
-                logDir = new File("target");
-            }
-
-            if (logDir.exists()) {
-                File[] files = logDir.listFiles();
-                if (files != null) {
-                    for (File file : files) {
-                        String lowerCaseFileName = file.getName().toLowerCase();
-                        if (lowerCaseFileName.contains(".log")
-                                && (lowerCaseFileName.contains("symmetric") || lowerCaseFileName.contains("wrapper"))) {
-                            try {
-                                FileUtils.copyFileToDirectory(file, tmpDir);
-                            } catch (IOException e) {
-                                log.warn("Failed to copy " + file.getName() + " to the snapshot directory", e);
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-
         FileWriter fwriter = null;
         try {
             fwriter = new FileWriter(new File(tmpDir, "config-export.csv"));
@@ -375,6 +329,52 @@ public static File createSnapshot(ISymmetricEngine engine) {
             IOUtils.closeQuietly(fos);
         }
 
+        File logDir = null;
+
+        String parameterizedLogDir = parameterService.getString("server.log.dir");
+        if (isNotBlank(parameterizedLogDir)) {
+            logDir = new File(parameterizedLogDir);
+        }
+
+        if (logDir != null && logDir.exists()) {
+            log.info("Using server.log.dir setting as the location of the log files");
+        } else {
+            logDir = new File("logs");
+        }
+
+        if (!logDir.exists()) {
+            Map<File, Layout> matches = findSymmetricLogFile();
+            if (matches != null && matches.size() == 1) {
+                logDir = matches.keySet().iterator().next().getParentFile();
+            }
+        }
+
+        if (!logDir.exists()) {
+            logDir = new File("../logs");
+        }
+
+        if (!logDir.exists()) {
+            logDir = new File("target");
+        }
+
+        if (logDir.exists()) {
+            log.info("Copying log files into snapshot file");
+            File[] files = logDir.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    String lowerCaseFileName = file.getName().toLowerCase();
+                    if (lowerCaseFileName.contains(".log")
+                            && (lowerCaseFileName.contains("symmetric") || lowerCaseFileName.contains("wrapper"))) {
+                        try {
+                            FileUtils.copyFileToDirectory(file, tmpDir);
+                        } catch (IOException e) {
+                            log.warn("Failed to copy " + file.getName() + " to the snapshot directory", e);
+                        }
+                    }
+                }
+            }
+        }
+
         File jarFile = null;
         try {
             jarFile = new File(getSnapshotDirectory(engine), tmpDir.getName() + ".zip");