From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox] time: make RFC3339 format in wasm conform to usual format
Date: Thu, 24 Aug 2023 16:11:00 +0200 [thread overview]
Message-ID: <20230824141100.3690333-1-d.csapak@proxmox.com> (raw)
on other targets we print the timestamp without fractional seconds
('.xxxZ'), so we should remove that too on wasm
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
proxmox-time/src/wasm.rs | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/proxmox-time/src/wasm.rs b/proxmox-time/src/wasm.rs
index 04cea7d..59c26e2 100644
--- a/proxmox-time/src/wasm.rs
+++ b/proxmox-time/src/wasm.rs
@@ -14,10 +14,19 @@ pub fn epoch_f64() -> f64 {
pub fn epoch_to_rfc3339_utc(epoch: i64) -> Result<String, Error> {
let js_date = js_sys::Date::new_0();
js_date.set_time((epoch as f64) * 1000.0);
- js_date
+ let mut js_date = js_date
.to_iso_string()
.as_string()
- .ok_or_else(|| format_err!("to_iso_string did not return a string"))
+ .ok_or_else(|| format_err!("to_iso_string did not return a string"))?;
+ let len = js_date.len();
+ if len < 24 {
+ bail!("invalid rfc3339 string");
+ }
+
+ // replace .xxxZ with Z
+ js_date.replace_range((len - 5).., "Z");
+
+ Ok(js_date)
}
/// Convert Unix epoch into RFC3339 local time with TZ
--
2.30.2
next reply other threads:[~2023-08-24 14:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 14:11 Dominik Csapak [this message]
2023-08-28 11:30 ` 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=20230824141100.3690333-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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal