Fixed logging and added steps to README

Author: open-schnick

Cargo.toml

@@ -13,7 +13,7 @@ clap = { version = "4.0.7", features = ["derive", "env"] }
 # ftp lib
 libunftp = "0.18.5"
 # own implementations
-unftp-filefighter = { path = "./server" }
+unftp-filefighter = { path = "server" }
 filefighter-api = { path = "api" }
 # async
 tokio = { version = "1", features = ["full"] }

README.org

@@ -1,3 +1,20 @@
 #+title: FileFighter FTP-Service
+#+options: toc:nil
 
 A small rust service faking a FTP-server by forwarding the requests to the FileFighter Backend (FileSystemService)
+
+* Run in Docker with local fss and fhs
+#+begin_src shell
+docker build . -t filefighter/ftp-service
+#+end_src
+
+#+begin_src shell
+docker run \
+    --name test \
+    -p 2121:2121 \
+    -p 10000-10010:10000-10010 \
+    -e FTP_SERVICE_BACKEND_URL=http://$(hostname):8080 \
+    -e FTP_SERVICE_FILEHANDLER_URL=http://$(hostname):5000 \
+    -e FTP_SERVICE_LOG_LEVEL=debug \
+    filefighter/ftp-service:latest
+#+end_src

src/cli.rs

@@ -39,15 +39,9 @@ pub struct Args {
 /// Implement conversion between config and args
 impl From<Args> for ApiConfig {
     fn from(args: Args) -> Self {
-        let mut backend_url = args.backend_url;
-        backend_url.push_str("/api");
-
-        let mut filehandler_url = args.filehandler_url;
-        filehandler_url.push_str("/data");
-
         Self {
-            fss_base_url: backend_url,
-            fhs_base_url: filehandler_url,
+            fss_base_url: args.backend_url,
+            fhs_base_url: args.filehandler_url,
         }
     }
 }

src/lib.rs

@@ -36,7 +36,11 @@ pub fn parse_cli_args() -> Args {
     // read from env
     dotenv().ok();
 
-    Args::parse()
+    let mut args = Args::parse();
+    // add missing uri components
+    args.backend_url.push_str("/api");
+    args.filehandler_url.push_str("/data");
+    args
 }
 
 pub async fn start_ftp_service(args: Args) -> Result<(), ServerError> {