Enabled transparent compression support.

This only works if the "transparent GZIP support" patch has been applied against Stapler. Otherwise, this patch will not compile as the new "LargeText" constructor will not be found. Additionally, the console.jelly was modified to make use of the stream instead of the raw file, which is necessary to get the correct uncompressed size of the file for skipping bytes. [JENKINS-2551] [JENKINS-10400] [JENKINS-13655] Signed-off-by: Martin Schroeder <martin.h.schroeder@intel.com>
jenkinsci · Oct 12, 2012 · 346fc99 · 346fc99
1 parent 1effef3
commit 346fc99
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java
@@ -77,7 +77,7 @@ public class AnnotatedLargeText<T> extends LargeText {
     private T context;
 
     public AnnotatedLargeText(File file, Charset charset, boolean completed, T context) {
-        super(file, charset, completed);
+        super(file, charset, completed, true);
         this.context = context;
     }
 

diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
@@ -1161,7 +1161,16 @@ public String toString() {
      * Returns the log file.
      */
     public File getLogFile() {
-        return new File(getRootDir(),"log");
+        File rawF = new File(getRootDir(), "log");
+        if (rawF.isFile()) {
+            return rawF;
+        }
+        File gzF = new File(getRootDir(), "log.gz");
+        if (gzF.isFile()) {
+            return gzF;
+        }
+        //If both fail, return the standard, uncompressed log file
+        return rawF;
     }
 
     /**
@@ -1174,13 +1183,15 @@ public File getLogFile() {
      */
     public InputStream getLogInputStream() throws IOException {
     	File logFile = getLogFile();
-    	if (logFile.exists() ) {
-            return new FileInputStream(logFile);
-    	}
-
-    	File compressedLogFile = new File(logFile.getParentFile(), logFile.getName()+ ".gz");
-    	if (compressedLogFile.exists()) {
-            return new GZIPInputStream(new FileInputStream(compressedLogFile));
+
+    	if (logFile != null && logFile.exists() ) {
+    	    // Checking if a ".gz" file was return
+    	    FileInputStream fis = new FileInputStream(logFile);
+    	    if (logFile.getName().endsWith(".gz")) {
+    	        return new GZIPInputStream(fis);
+    	    } else {
+    	        return fis;
+    	    }
     	}
 
     	return new NullInputStream(0);

diff --git a/core/src/main/resources/hudson/model/Run/console.jelly b/core/src/main/resources/hudson/model/Run/console.jelly
@@ -35,7 +35,7 @@ THE SOFTWARE.
       </t:buildCaption>
       <j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
       <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
-      <j:set var="offset" value="${empty(consoleFull) ? it.logFile.length()-threshold*1024 : 0}" />
+      <j:set var="offset" value="${empty(consoleFull) ? it.logText.length()-threshold*1024 : 0}" />
       <j:choose>
         <j:when test="${offset > 0}">
           ${%skipSome(offset/1024,"consoleFull")}