Compare commits

...

1 Commits

Author SHA1 Message Date
c165ee9cc2 renamed docker detect dto
All checks were successful
Rust Cross-Platform Build / Detect Rust Project (push) Successful in 4s
Rust Cross-Platform Build / Run Tests (push) Successful in 1m6s
Rust Cross-Platform Build / Build (x86_64-unknown-linux-gnu) (push) Successful in 2m53s
Rust Cross-Platform Build / Build (x86_64-pc-windows-gnu) (push) Successful in 3m41s
Rust Cross-Platform Build / Set Tag Name (push) Successful in 3s
Rust Cross-Platform Build / Build and Push Docker Image (push) Successful in 2m5s
Rust Cross-Platform Build / Workflow Summary (push) Successful in 2s
Rust Cross-Platform Build / Create Tag (push) Successful in 5s
2025-10-29 23:07:34 +01:00
4 changed files with 7 additions and 7 deletions

View File

@@ -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<dyn Error + Send + Sync>> {
// First get local IP
println!("Preparing to broadcast docker containers...");

View File

@@ -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<DockerRegistrationDto, Box<dyn Error + Send + Sync>> {
) -> Result<DockerServiceDto, Box<dyn Error + Send + Sync>> {
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,
};

View File

@@ -115,7 +115,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
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(&"")?,

View File

@@ -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,