• Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major Major
    • core
    • None

      As of Hudson 1.350, the console log shown for a build in the NetBeans output window displays as one big line:

      Started by an SCM change<br>Building on master<br>....

      This is using the /progressiveLog API (see URL for source).

          [JENKINS-5941] /progressiveLog broken in Hudson 1.350

          Jesse Glick created issue -

          Jesse Glick added a comment -

          Seems to be a regression caused by fixing HTML display for web client.

          Jesse Glick added a comment - Seems to be a regression caused by fixing HTML display for web client.
          Jesse Glick made changes -
          Link New: This issue is blocking JENKINS-5852 [ JENKINS-5852 ]

          Alan Harder added a comment - - edited

          I traced thru a bit and looks like this is due to running output thru a MarkupText in ConsoleAnnotationOutputStream.eol() even though in this case the response has already been set to text/plain.

          Assigning to kohsuke to determine the right fix here.. maybe no MarkupText, maybe no annotation at all? (adding <a> around a URL in text/plain?)

          Another note: while looking at this I noticed that MarkupText.toString(boolean) has an "if (tags.isEmpty())" check right away.. if this is true, then the "boolean preEscape" parameter is ignored/unused.. should this return statement do the xmlEscape() vs escape() thing that is done below like line 280?

          Alan Harder added a comment - - edited I traced thru a bit and looks like this is due to running output thru a MarkupText in ConsoleAnnotationOutputStream.eol() even though in this case the response has already been set to text/plain. Assigning to kohsuke to determine the right fix here.. maybe no MarkupText, maybe no annotation at all? (adding <a> around a URL in text/plain?) Another note: while looking at this I noticed that MarkupText.toString(boolean) has an "if (tags.isEmpty())" check right away.. if this is true, then the "boolean preEscape" parameter is ignored/unused.. should this return statement do the xmlEscape() vs escape() thing that is done below like line 280?
          Alan Harder made changes -
          Assignee New: Kohsuke Kawaguchi [ kohsuke ]

          Code changed in hudson
          User: : mindless
          Path:
          trunk/hudson/main/core/src/main/java/hudson/MarkupText.java
          trunk/hudson/main/core/src/test/java/hudson/MarkupTextTest.java
          http://jenkins-ci.org/commit/28737
          Log:
          JENKINS-5941 JENKINS-5944 MarkupText.toString(boolean) was ignoring the
          preEscape parameter when no markup tags were added.

          SCM/JIRA link daemon added a comment - Code changed in hudson User: : mindless Path: trunk/hudson/main/core/src/main/java/hudson/MarkupText.java trunk/hudson/main/core/src/test/java/hudson/MarkupTextTest.java http://jenkins-ci.org/commit/28737 Log: JENKINS-5941 JENKINS-5944 MarkupText.toString(boolean) was ignoring the preEscape parameter when no markup tags were added.

          Alan Harder added a comment -

          I fixed the MarkupText bug I mentioned above.. leaving the markup/annotations-for-text/plain? issue to Kohsuke.

          Alan Harder added a comment - I fixed the MarkupText bug I mentioned above.. leaving the markup/annotations-for-text/plain? issue to Kohsuke.

          Perhaps for compatibility reasons I should leave progressiveLog as plain text and use a different URL for text/html.

          Kohsuke Kawaguchi added a comment - Perhaps for compatibility reasons I should leave progressiveLog as plain text and use a different URL for text/html.

          Code changed in hudson
          User: : kohsuke
          Path:
          trunk/hudson/main/core/pom.xml
          trunk/hudson/main/core/src/main/java/hudson/console/AnnotatedLargeText.java
          trunk/hudson/main/core/src/main/java/hudson/model/Computer.java
          trunk/hudson/main/core/src/main/java/hudson/model/Run.java
          trunk/hudson/main/core/src/main/java/hudson/model/TaskAction.java
          trunk/hudson/main/core/src/main/java/hudson/triggers/SCMTrigger.java
          trunk/hudson/main/core/src/main/resources/hudson/model/Run/console.jelly
          trunk/hudson/main/core/src/main/resources/hudson/model/TaskAction/log.jelly
          trunk/hudson/main/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
          trunk/hudson/main/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java
          trunk/www/changelog.html
          http://jenkins-ci.org/commit/28764
          Log:
          [FIXED JENKINS-5941] in 1.352. Keep progressiveText for text/plain and serve text/html from a different URL.

          SCM/JIRA link daemon added a comment - Code changed in hudson User: : kohsuke Path: trunk/hudson/main/core/pom.xml trunk/hudson/main/core/src/main/java/hudson/console/AnnotatedLargeText.java trunk/hudson/main/core/src/main/java/hudson/model/Computer.java trunk/hudson/main/core/src/main/java/hudson/model/Run.java trunk/hudson/main/core/src/main/java/hudson/model/TaskAction.java trunk/hudson/main/core/src/main/java/hudson/triggers/SCMTrigger.java trunk/hudson/main/core/src/main/resources/hudson/model/Run/console.jelly trunk/hudson/main/core/src/main/resources/hudson/model/TaskAction/log.jelly trunk/hudson/main/core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly trunk/hudson/main/test/src/test/java/hudson/console/ConsoleAnnotatorTest.java trunk/www/changelog.html http://jenkins-ci.org/commit/28764 Log: [FIXED JENKINS-5941] in 1.352. Keep progressiveText for text/plain and serve text/html from a different URL.
          SCM/JIRA link daemon made changes -
          Resolution New: Fixed [ 1 ]
          Status Original: Open [ 1 ] New: Resolved [ 5 ]

            kohsuke Kohsuke Kawaguchi
            jglick Jesse Glick
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

              Created:
              Updated:
              Resolved: