This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 1445b6e Strip only trailing line ender from log lines produced by
actions. (#4852)
1445b6e is described below
commit 1445b6e447fbc8f0ad4d0b39268ad3e47648867c
Author: rodric rabbah <[email protected]>
AuthorDate: Tue Mar 17 08:25:48 2020 -0400
Strip only trailing line ender from log lines produced by actions. (#4852)
Stripping both leading and trailing spaces will alter the formatting of the
logs produced by actions.
This changes the stripping only to trailing new line or return character.
---
.../core/containerpool/logging/DockerToActivationLogStore.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationLogStore.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationLogStore.scala
index 064c293..c11b8c5 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationLogStore.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/containerpool/logging/DockerToActivationLogStore.scala
@@ -39,7 +39,7 @@ import spray.json._
* Represents a single log line as read from a docker log
*/
protected[core] case class LogLine(time: String, stream: String, log: String) {
- def toFormattedString = f"$time%-30s $stream: ${log.trim}"
+ def toFormattedString = f"$time%-30s $stream: ${log.stripLineEnd}"
}
protected[core] object LogLine extends DefaultJsonProtocol {
