Skip to content

The Unified and Autonomous Development Platform

Improvements and bug fixes

Robin Shen1b6ef600d8ee
diff --git a/pom.xml b/pom.xml
index 4726818dba..a5e1dd8950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -681,8 +681,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.2.10</commons.version>
- <agent.version>2.5.7</agent.version>
+ <commons.version>3.3.0</commons.version>
+ <agent.version>2.5.8</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
index 4aff519ae1..10efc3b2b8 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
@@ -211,8 +211,6 @@ public class JobLogEntryEx implements Serializable {
}
return null;
}
-
- ;
};
StringBuilder actionDataBuilder = null;
@@ -233,6 +231,7 @@ public class JobLogEntryEx implements Serializable {
currentTextBuilder.setLength(0);
}
cursor.set(0);
+ currentTextBuilder.append(currentChar);
} else if (actionDataBuilder != null) {
if (Character.isLetter(currentChar)) {
if (currentTextBuilder.length() != 0) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/logging/log.js b/server-core/src/main/java/io/onedev/server/web/component/logging/log.js
index d78f1757b1..47d5c95046 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/logging/log.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/logging/log.js
@@ -1,13 +1,27 @@
onedev.server.log = {
- appendLogEntries: function(containerId, logEntries) {
+ appendLogEntries: function(containerId, logEntries) {
var $log = $("#" + containerId + ">.log");
// parent scrollbar jumps as we remove/add log entries in chrome. Let's restore it afterwards
$log.parents().each(function() {
$(this).data("logScrollLeft", $(this).scrollLeft());
$(this).data("logScrollTop", $(this).scrollTop());
});
- for (var i=0; i<logEntries.length; i++)
- $log.append(onedev.server.jobLogEntry.render(logEntries[i], true));
+ for (var i=0; i<logEntries.length; i++) {
+ var logEntry = logEntries[i];
+ var replacing = logEntry.messages.length != 0 && logEntry.messages[0].text.charAt(0) == "\r";
+ if (replacing)
+ logEntry.messages[0].text = logEntry.messages[0].text.substring(1);
+ var $logEntry = onedev.server.jobLogEntry.render(logEntry, true);
+ if (replacing) {
+ var $lastEntry = $log.children(".log-entry:last");
+ if ($lastEntry.length != 0)
+ $lastEntry.replaceWith($logEntry);
+ else
+ $log.append($logEntry);
+ } else {
+ $log.append($logEntry);
+ }
+ }
var $entries = $log.children(".log-entry");