From c165ee9cc235530646086b440c7a09299941a1a3 Mon Sep 17 00:00:00 2001 From: donpat1to Date: Wed, 29 Oct 2025 23:07:34 +0100 Subject: [PATCH] renamed docker detect dto --- WatcherAgent/src/api.rs | 4 ++-- WatcherAgent/src/docker/mod.rs | 6 +++--- WatcherAgent/src/main.rs | 2 +- WatcherAgent/src/models.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WatcherAgent/src/api.rs b/WatcherAgent/src/api.rs index ebdbfea..9130e82 100644 --- a/WatcherAgent/src/api.rs +++ b/WatcherAgent/src/api.rs @@ -15,7 +15,7 @@ use std::time::Duration; use crate::docker::serverclientcomm::handle_server_message; use crate::hardware::HardwareInfo; use crate::models::{ - Acknowledgment, DockerMetricDto, DockerRegistrationDto, HeartbeatDto, + Acknowledgment, DockerMetricDto, DockerServiceDto, HeartbeatDto, IdResponse, MetricDto, RegistrationDto, ServerMessage, }; @@ -190,7 +190,7 @@ async fn get_server_id_by_ip( pub async fn broadcast_docker_containers( base_url: &str, server_id: u16, - container_dto: &DockerRegistrationDto, + container_dto: &DockerServiceDto, ) -> Result<(), Box> { // First get local IP println!("Preparing to broadcast docker containers..."); diff --git a/WatcherAgent/src/docker/mod.rs b/WatcherAgent/src/docker/mod.rs index 72bc249..be0c2c6 100644 --- a/WatcherAgent/src/docker/mod.rs +++ b/WatcherAgent/src/docker/mod.rs @@ -13,7 +13,7 @@ pub mod stats; use crate::models::{ DockerCollectMetricDto, DockerContainer, DockerContainerCpuDto, DockerContainerInfo, - DockerContainerNetworkDto, DockerContainerRamDto, DockerMetricDto, DockerRegistrationDto, + DockerContainerNetworkDto, DockerContainerRamDto, DockerMetricDto, DockerServiceDto, DockerContainerStatusDto }; use bollard::Docker; @@ -305,12 +305,12 @@ impl DockerManager { pub async fn create_registration_dto( &self, - ) -> Result> { + ) -> Result> { let containers = self.get_containers().await?; let container_string = serde_json::to_value(&containers)?; - let dto = DockerRegistrationDto { + let dto = DockerServiceDto { server_id: 0, // This will be set by the caller containers: container_string, }; diff --git a/WatcherAgent/src/main.rs b/WatcherAgent/src/main.rs index 97bf156..a565efe 100644 --- a/WatcherAgent/src/main.rs +++ b/WatcherAgent/src/main.rs @@ -115,7 +115,7 @@ async fn main() -> Result<(), Box> { docker_manager.create_registration_dto().await? } else { println!("Fallback for failing registration"); - models::DockerRegistrationDto { + models::DockerServiceDto { server_id: 0, //container_count: 0, --- IGNORE --- containers: serde_json::to_value(&"")?, diff --git a/WatcherAgent/src/models.rs b/WatcherAgent/src/models.rs index b2920fb..b178f8a 100644 --- a/WatcherAgent/src/models.rs +++ b/WatcherAgent/src/models.rs @@ -184,7 +184,7 @@ pub struct Acknowledgment { /// - `Name`: Container name (string) /// - `Status`: Container status ("running", "stopped", etc.) #[derive(Debug, Serialize, Clone)] -pub struct DockerRegistrationDto { +pub struct DockerServiceDto { /// Unique server identifier (integer) #[serde(rename = "Server_id")] pub server_id: u16,