From b6dd68fc89eda1f08c8a1781bdc03e6a46b4c80c Mon Sep 17 00:00:00 2001 From: Ramil_Algayev Date: Thu, 26 Dec 2024 01:54:31 +0400 Subject: [PATCH] updated for brain update --- brain.proto | 2 +- src/data.rs | 6 ++++-- src/grpc.rs | 4 +--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/brain.proto b/brain.proto index a33c211..fd8662f 100644 --- a/brain.proto +++ b/brain.proto @@ -54,7 +54,6 @@ message UpdateVMReq { message UpdateVMResp { string uuid = 1; - string timestamp = 2; string error = 3; } @@ -72,6 +71,7 @@ message VMContract { string kernel_sha = 11; string dtrfs_sha = 12; string created_at = 13; + string updated_at = 14; } message ListVMContractsReq { diff --git a/src/data.rs b/src/data.rs index 2305574..b583d69 100644 --- a/src/data.rs +++ b/src/data.rs @@ -69,6 +69,7 @@ pub struct Contract { pub kernel_sha: String, pub dtrfs_sha: String, pub created_at: String, + pub updated_at: String, } impl Into for Contract { @@ -87,6 +88,7 @@ impl Into for Contract { kernel_sha: self.kernel_sha, dtrfs_sha: self.dtrfs_sha, created_at: self.created_at, + updated_at: self.updated_at, } } } @@ -201,6 +203,7 @@ impl BrainData { public_ipv4: confirmation.public_ipv4, public_ipv6: confirmation.public_ipv6, created_at: format!("{:?}", std::time::SystemTime::now()), + updated_at: format!("{:?}", std::time::SystemTime::now()), hostname: newvmreq.0.hostname, admin_pubkey: newvmreq.0.admin_pubkey, node_pubkey: newvmreq.0.node_pubkey, @@ -243,6 +246,7 @@ impl BrainData { contract.memory_mb = updatevmreq.0.memory_mb; contract.kernel_sha = updatevmreq.0.kernel_sha; contract.dtrfs_sha = updatevmreq.0.dtrfs_sha; + contract.updated_at = format!("{:?}", std::time::SystemTime::now()); } } @@ -307,7 +311,6 @@ impl BrainData { ); self.submit_update_vmconfirmation(grpc::UpdateVmResp { uuid, - timestamp: format!("{:?}", std::time::SystemTime::now()), error: "Daemon is offline.".to_string(), }) .await; @@ -317,7 +320,6 @@ impl BrainData { warn!("No daemon TX found for {}", req.node_pubkey); self.submit_update_vmconfirmation(grpc::UpdateVmResp { uuid, - timestamp: format!("{:?}", std::time::SystemTime::now()), error: "Daemon is offline.".to_string(), }) .await; diff --git a/src/grpc.rs b/src/grpc.rs index 1dc7616..ac87b78 100644 --- a/src/grpc.rs +++ b/src/grpc.rs @@ -181,7 +181,6 @@ impl BrainDaemonService for BrainDaemonMock { data.submit_update_vmconfirmation(UpdateVmResp { error: "Daemon not connected.".to_string(), uuid: updatevmreq.uuid, - timestamp: format!("{:?}", std::time::SystemTime::now()), }) .await; break; @@ -202,9 +201,8 @@ impl BrainDaemonService for BrainDaemonMock { let mut confirmations = req.into_inner(); while let Some(confirmation) = confirmations.next().await { match confirmation { - Ok(mut c) => { + Ok(c) => { info!("Received confirmation from daemon: {c:?}"); - c.timestamp = format!("{:?}", std::time::SystemTime::now()); self.data.submit_update_vmconfirmation(c).await; } Err(e) => {