Merge pull request #63 from jenkinsci/jenkins-34719

[FIXED JENKINS-34719] Pick up and logs that have been refactored into JENKINS_HOME/logs
jenkinsci · May 11, 2016 · 7d4a2c9 · 7d4a2c9
2 parents 0df6d15 + 97d0103
commit 7d4a2c9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/support/impl/JenkinsLogs.java b/src/main/java/com/cloudbees/jenkins/support/impl/JenkinsLogs.java
@@ -392,6 +392,15 @@ private void addOtherMasterLogs(Container result) {
                 result.add(new FileContent("other-logs/" + f.getName(), f));
             }
         }
+        File logs = new File(jenkins.getRootDir(), "logs");
+        if (logs.isDirectory()) {
+            files = logs.listFiles(ROTATED_LOGFILE_FILTER);
+            if (files != null) {
+                for (File f : files) {
+                    result.add(new FileContent("other-logs/" + f.getName(), f));
+                }
+            }
+        }
     }
 
     /**