added a server module for launching the API and HTTP services (#4)

anor-rs · Nov 6, 2023 · 9887dd3 · 9887dd3
1 parent d33feec
commit 9887dd3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/anor-api/Cargo.toml b/anor-api/Cargo.toml
@@ -22,3 +22,4 @@ anor-storage = { path = "../anor-storage"}
 
 [build-dependencies]
 prost-build = "0.12.1"
+
diff --git a/anor-api/src/proto/api_service.proto b/anor-api/src/proto/api_service.proto
@@ -3,4 +3,4 @@ package anor_service_protobuf;
 
 message Keys {
   repeated string key = 1;
-}
+}
diff --git a/anor-api/src/service/api_service.rs b/anor-api/src/service/api_service.rs
@@ -11,7 +11,11 @@ use anor_utils::{config::Config, threadpool::ThreadPool};
 
 pub trait ApiService {
     fn with_config(storage: Storage, config: Arc<Config>) -> Self;
-    fn start(&self, server_shutdown: Arc<AtomicBool>, signal_server_ready: Sender<()>) -> Result<(), String>;
+    fn start(
+        &self,
+        server_shutdown: Arc<AtomicBool>,
+        signal_server_ready: Sender<()>,
+    ) -> Result<(), String>;
     fn stop(&self);
     fn keys(&self) -> Vec<String>;
     fn set_item(&self, key: &str, item: StorageItem) -> bool;
@@ -31,7 +35,11 @@ impl ApiService for StorageApi {
         StorageApi { storage, config }
     }
 
-    fn start(&self, shutdown: Arc<AtomicBool>, signal_ready_sender: Sender<()>) -> Result<(), String> {
+    fn start(
+        &self,
+        shutdown: Arc<AtomicBool>,
+        signal_ready_sender: Sender<()>,
+    ) -> Result<(), String> {
         assert!(self.config.api.is_some());
         let config_server = self.config.api.as_ref().unwrap();
         assert!(!config_server.listen_on.is_empty());
@@ -44,10 +52,7 @@ impl ApiService for StorageApi {
             return Err(err.to_string());
         }
 
-        log::info!(
-            "Anor Storage API service listening on {} ...",
-            listen_on
-        );
+        log::info!("Anor Storage API service listening on {} ...", listen_on);
         // listener.set_nonblocking(true).unwrap();
 
         let pool = ThreadPool::new(2);

diff --git a/anor-http/CHANGELOG.md b/anor-http/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## 0.1.1 (2023-11-03)
+## Unreleased
 
 * project moved into anor workspace
 * added http service

diff --git a/anor-http/Cargo.toml b/anor-http/Cargo.toml
@@ -27,3 +27,4 @@ http_common = "0.2.2"
 
 anor-utils = { path = "../anor-utils"}
 anor-storage = { path = "../anor-storage"}
+
diff --git a/anor-server/CHANGELOG.md b/anor-server/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## 0.1.1 (2023-11-06)
+## Unreleased
 
 * project moved into anor workspace
 

diff --git a/anor-server/Cargo.toml b/anor-server/Cargo.toml
@@ -19,4 +19,3 @@ anor-storage = { path = "../anor-storage"}
 anor-api = { path = "../anor-api"}
 anor-http = { path = "../anor-http"}
 anor-utils = { path = "../anor-utils"}
-