update dependencies

Author: Bobonium

CHANGELOG.md

@@ -1,7 +1,8 @@
 # WIP 1.0.0
 
  - added `LeastMessageRouter`
-
+ - config now supports loading optional file `./config/tyra.toml` to overwrite config parameters
+   - defaults < `./config/tyra.toml` < environment variables
 
 # 0.8.0
 

Cargo.toml

@@ -18,17 +18,16 @@ name = "tyra"
 path = "src/lib.rs"
 
 [dependencies]
-config = "0.11.0"
+config = "0.13.2"
 hostname = "0.3.1"
-num_cpus = "1.13.0"
+num_cpus = "1.13.1"
 threadpool = "1.8.1"
-crossbeam-channel = "^0.5"
-crossbeam-utils = "^0.8"
-dashmap = "^4.0"
-serde = { version = "^1.0", features = ["derive"] }
-thiserror = "1.0.31"
-log = "0.4"
+crossbeam-channel = "0.5.6"
 flume = "0.10.14"
+dashmap = "5.4.0"
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "1.0"
+log = "0.4"
 
 [dev-dependencies]
 bincode = "1.3.3"

README.md

@@ -2,7 +2,6 @@
 
 `Tyra` is a cross-platform Typed Actor System Written in Rust.
 
-
 ## Current State
 
 `0.8.0` is intended to be the last minor release before `1.0.0` where it's officially declared ready for production
@@ -18,6 +17,12 @@ So why's it not yet `1.0.0`?
 
 The current development status can be tracked in the [CHANGELOG.md](CHANGELOG.md)
 
+## Configuration
+
+See [default.toml](./src/config/default.toml) for a list of all configuration parameters and their defaults.
+
+Configuration can be adjusted by providing a `./config/tyra.toml`.
+
 ## Clustering
 
 Through the current implementation of the `SerializedMessage` it's proven that this system can be clustered.

examples/benchmark_single_actor_process_after_send.rs

@@ -69,6 +69,8 @@ impl Handler<MessageA> for Benchmark {
 
 fn main() {
     let actor_config = TyraConfig::new().unwrap();
+    let test = actor_config.thread_pool.config.get("default").unwrap();
+    let test = test.threads_max;
     let actor_system = ActorSystem::new(actor_config);
 
     let message_count = 10000000;
@@ -84,6 +86,8 @@ fn main() {
         )
         .unwrap();
     println!("Actors have been created");
+    println!("TEST: {}", actor.get_address().system);
+    println!("TEST2: {}", test);
     let start = Instant::now();
 
     actor.sleep(Duration::from_secs(3)).unwrap();

src/config/tyra_config.rs

@@ -1,3 +1,4 @@
+use std::path::Path;
 use crate::config::global_config::GeneralConfig;
 use crate::config::pool_config::PoolConfig;
 
@@ -33,19 +34,19 @@ impl TyraConfig {
     /// config.general.name = String::from("HelloWorld");
     /// ```
     pub fn new() -> Result<Self, ConfigError> {
-        let mut config = Config::new();
 
         let default: &str = std::include_str!("default.toml");
 
-        config
-            .merge(File::from_str(default, FileFormat::Toml))
-            .expect("Could not load default Config");
+        let mut config = Config::builder();
 
-        config
-            .merge(Environment::with_prefix("TYRA").separator("_CONFIG_"))
-            .expect("Could not parse ENV variables");
+        config = config.add_source(File::from_str(default, FileFormat::Toml));
+        let path = Path::new("config/tyra.toml");
+        if path.exists() {
+            config = config.add_source(File::from(Path::new("config/tyra.toml")));
+        }
 
-        let mut parsed: TyraConfig = config.try_into().expect("Could not parse Config");
+        let conf = config.build().expect("Could not fetch Config");
+        let mut parsed: TyraConfig = conf.try_deserialize().expect("Could not parse Config");
         if parsed.general.name == "$HOSTNAME" {
             parsed.general.name = String::from(hostname::get().unwrap().to_str().unwrap());
         }