From 7cd2ba33643c2f598ce7325be5070ccd8ac824f6 Mon Sep 17 00:00:00 2001
From: Barry Pederson <barry.pederson@und.edu>
Date: Sun, 3 Nov 2024 10:31:31 -0800
Subject: [PATCH] Rename server.rs to handler.rs for clarity, since this is
 responsible for handling one interaction with a client

---
 server/src/{server.rs => handler.rs} | 8 ++++----
 server/src/listener.rs               | 4 ++--
 server/src/main.rs                   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename server/src/{server.rs => handler.rs} (88%)

diff --git a/server/src/server.rs b/server/src/handler.rs
similarity index 88%
rename from server/src/server.rs
rename to server/src/handler.rs
index 3884d14..fe4f1a8 100644
--- a/server/src/server.rs
+++ b/server/src/handler.rs
@@ -3,14 +3,14 @@ use common::{Request, RESPONSE_NO, RESPONSE_OK};
 use std::io::{Error, Write};
 use std::os::unix::net::UnixStream;
 
-pub struct Server {
+pub struct Handler {
     stream: UnixStream,
     handler: PasswordDirectory,
 }
 
-impl Server {
-    pub fn new(stream: UnixStream, handler: PasswordDirectory) -> Result<Server, Error> {
-        Ok(Server { stream, handler })
+impl Handler {
+    pub fn new(stream: UnixStream, handler: PasswordDirectory) -> Result<Handler, Error> {
+        Ok(Handler { stream, handler })
     }
 
     fn communicate(&mut self) -> Result<(), Error> {
diff --git a/server/src/listener.rs b/server/src/listener.rs
index 86de97f..3d254fe 100644
--- a/server/src/listener.rs
+++ b/server/src/listener.rs
@@ -1,6 +1,6 @@
+use crate::handler::Handler;
 use crate::options::OPTIONS;
 use crate::repository::PasswordDirectory;
-use crate::server::Server;
 use std::fs::{metadata, set_permissions};
 use std::io::Error;
 use std::os::unix::fs::PermissionsExt;
@@ -34,7 +34,7 @@ impl Listener {
                 Ok(stream) => {
                     /* connection succeeded */
                     let handler = self.handler.clone();
-                    thread::spawn(|| Server::new(stream, handler).unwrap().handle_client());
+                    thread::spawn(|| Handler::new(stream, handler).unwrap().handle_client());
                 }
                 Err(_err) => {
                     /* connection failed */
diff --git a/server/src/main.rs b/server/src/main.rs
index c7e785c..642f605 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,7 +1,7 @@
+mod handler;
 mod listener;
 pub mod options;
 mod repository;
-mod server;
 
 use crate::listener::Listener;
 use crate::options::OPTIONS;