From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 1/2] rest-server/worker-task: replace newlines with '\n' in task result
Date: Mon, 11 Oct 2021 14:14:31 +0200 [thread overview]
Message-ID: <20211011121432.1006944-1-d.csapak@proxmox.com> (raw)
we parse the task result from the last line, so we should not print a
new line in the task result, else we get an 'unknown' task state
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
no changes
proxmox-rest-server/src/worker_task.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs
index 51394549..a8899ab9 100644
--- a/proxmox-rest-server/src/worker_task.rs
+++ b/proxmox-rest-server/src/worker_task.rs
@@ -494,7 +494,7 @@ impl TaskState {
match self {
TaskState::Error { message, .. } => format!("TASK ERROR: {}", message),
other => format!("TASK {}", other),
- }
+ }.replace('\n', "\\n") // no newline in task result
}
fn from_endtime_and_message(endtime: i64, s: &str) -> Result<Self, Error> {
--
2.30.2
next reply other threads:[~2021-10-11 12:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 12:14 Dominik Csapak [this message]
2021-10-11 12:14 ` [pbs-devel] [PATCH proxmox-backup v2 2/2] backup-proxy: fix api log reopen send_command calls Dominik Csapak
2021-10-11 12:57 ` [pbs-devel] applied: " Thomas Lamprecht
2021-10-11 13:12 ` [pbs-devel] [PATCH proxmox-backup v2 1/2] rest-server/worker-task: replace newlines with '\n' in task result Thomas Lamprecht
2021-10-11 13:14 ` Dominik Csapak
2021-10-11 13:23 ` Thomas Lamprecht
2021-10-11 13:30 ` Dominik Csapak
2021-10-11 13:37 ` Thomas Lamprecht
2021-10-11 13:57 ` Dominik Csapak
2021-10-12 5:33 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211011121432.1006944-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.