Rename server::Server to server::Worker

Rename symbol to avoid a redundancy with its parent module.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

crates/krun/src/server/bin/krun-server.rs

@@ -2,7 +2,7 @@ use std::os::unix::process::ExitStatusExt as _;
 
 use anyhow::Result;
 use krun::server::cli_options::options;
-use krun::server::server::{Server, State};
+use krun::server::worker::{State, Worker};
 use log::error;
 use tokio::net::TcpListener;
 use tokio::process::Command;
@@ -19,9 +19,9 @@ async fn main() -> Result<()> {
     let listener = TcpListener::bind(format!("0.0.0.0:{}", options.server_port)).await?;
     let (state_tx, state_rx) = watch::channel(State::new());
 
-    let mut server_handle = tokio::spawn(async move {
-        let mut server = Server::new(listener, state_tx);
-        server.run().await;
+    let mut worker_handle = tokio::spawn(async move {
+        let mut worker = Worker::new(listener, state_tx);
+        worker.run().await;
     });
     let command_status = Command::new(&options.command)
         .args(options.command_args)
@@ -34,7 +34,7 @@ async fn main() -> Result<()> {
 
     loop {
         tokio::select! {
-            res = &mut server_handle, if !server_died => {
+            res = &mut worker_handle, if !server_died => {
                 // If an error is received here, accepting connections from the
                 // TCP listener failed due to non-transient errors and the
                 // server is giving up and shutting down.

crates/krun/src/server/mod.rs

@@ -1,2 +1,2 @@
 pub mod cli_options;
-pub mod server;
+pub mod worker;

crates/krun/src/server/server.rs crates/krun/src/server/worker.rscrates/krun/src/server/server.rs renamed to crates/krun/src/server/worker.rs

@@ -18,7 +18,7 @@ use crate::utils::launch::Launch;
 use crate::utils::stdio::make_stdout_stderr;
 
 #[derive(Debug)]
-pub struct Server {
+pub struct Worker {
     listener_stream: TcpListenerStream,
     state_tx: watch::Sender<State>,
     child_set: JoinSet<(PathBuf, ChildResult)>,
@@ -32,9 +32,9 @@ pub struct State {
 
 type ChildResult = Result<ExitStatus, io::Error>;
 
-impl Server {
+impl Worker {
     pub fn new(listener: TcpListener, state_tx: watch::Sender<State>) -> Self {
-        Server {
+        Worker {
             listener_stream: TcpListenerStream::new(listener),
             state_tx,
             child_set: JoinSet::new(),