watcher

.github/workflows/create-release.yaml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        project: [ myceli, controller, hyphae ]
+        project: [ myceli, controller, hyphae, watcher ]
         target:
           [
             armv7-unknown-linux-gnueabihf,
@@ -60,6 +60,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        project: [ myceli, watcher ]
         target:
           [
             armv7-unknown-linux-gnueabihf,
@@ -73,14 +74,14 @@ jobs:
       - name: clean cargo
         run: cargo clean
       - name: cargo/cross build
-        run: CROSS_CONFIG=Cross.toml cross build --bin myceli --target ${{ matrix.target }} --profile small --features small --no-default-features
+        run: CROSS_CONFIG=Cross.toml cross build --bin ${{ matrix.project }} --target ${{ matrix.target }} --profile small --features small --no-default-features
       - name: Compress binary
         run: |
-          tar -cvf myceli-small-${{ github.ref_name }}-${{ matrix.target }}.tar -C ./target/${{ matrix.target }}/small myceli
-          xz -9 --keep --extreme myceli-small-${{ github.ref_name }}-${{ matrix.target }}.tar
-          gzip --best myceli-small-${{ github.ref_name }}-${{ matrix.target }}.tar
+          tar -cvf ${{ matrix.project }}-small-${{ github.ref_name }}-${{ matrix.target }}.tar -C ./target/${{ matrix.target }}/small ${{ matrix.project }}
+          xz -9 --keep --extreme ${{ matrix.project }}-small-${{ github.ref_name }}-${{ matrix.target }}.tar
+          gzip --best ${{ matrix.project }}-small-${{ github.ref_name }}-${{ matrix.target }}.tar
       - name: upload binary
-        run: gh release upload "$GITHUB_REF" myceli-small-${{ github.ref_name }}-${{ matrix.target }}.tar.?z
+        run: gh release upload "$GITHUB_REF" *-small-${{ github.ref_name }}-${{ matrix.target }}.tar.?z
         env:
           GITHUB_TOKEN: ${{ github.token }}
         shell: bash

config/Cargo.toml

@@ -7,5 +7,6 @@ edition = "2021"
 anyhow.workspace = true
 dirs = "5.0.1"
 figment.workspace = true
+log.workspace = true
 serde.workspace = true
 transports.workspace = true

config/src/config.rs

@@ -3,6 +3,7 @@ use figment::{
     providers::{Format, Serialized, Toml},
     Figment, Provider,
 };
+use log::debug;
 use serde::{Deserialize, Serialize};
 use transports::MAX_MTU;
 
@@ -69,7 +70,7 @@ impl Config {
         let mut config = Figment::from(Serialized::defaults(Config::default()));
         if let Some(path) = path.or(default_path()) {
             let toml_values = Toml::file(&path);
-            println!("Config values in file {}: {:?}", &path, toml_values.data());
+            debug!("Config values in file {}: {:?}", &path, toml_values.data());
             config = config.merge(toml_values);
         }
         let config: Self = config.extract()?;

local-storage/src/storage.rs

@@ -12,7 +12,7 @@ use std::fs::File as FsFile;
 use std::io::Write;
 use std::path::Path;
 
-use log::{error, info};
+use log::{debug, error, info};
 
 pub struct Storage {
     pub provider: Box<dyn StorageProvider>,
@@ -28,6 +28,7 @@ impl Storage {
     }
 
     pub fn import_path(&self, path: &Path) -> Result<String> {
+        debug!("import_path({:?})", &path);
         let rt = tokio::runtime::Runtime::new()?;
         let blocks: Result<Vec<Block>> = rt.block_on(async {
             let file: File = FileBuilder::new()

myceli/Cargo.toml

@@ -9,6 +9,7 @@ rust-version.workspace = true
 [dependencies]
 anyhow.workspace = true
 cid = { workspace = true, features = ["scale-codec"] }
+config.workspace = true
 env_logger = { workspace = true, optional = true }
 figment.workspace = true
 local-storage = { path = "../local-storage", default-features = false }

myceli/src/listener.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 use std::thread::spawn;
 use transports::Transport;
 
-use log::{debug, error, info};
+use log::{error, info};
 
 pub struct Listener<T> {
     storage_path: String,
@@ -100,7 +100,7 @@ impl<T: Transport + Send + 'static> Listener<T> {
                     }
                 }
                 Err(_e) => {
-                    debug!("Receive message failed: {_e}");
+                    println!("Receive message failed: {_e}");
                 }
             }
         }
@@ -112,7 +112,7 @@ impl<T: Transport + Send + 'static> Listener<T> {
         sender_addr: &str,
         shipper_sender: Sender<(DataProtocol, String)>,
     ) -> Result<Option<Message>> {
-        info!("Handling {message:?}");
+        println!("Handling {message:?}");
         let resp = match message {
             Message::ApplicationAPI(ApplicationAPI::TransmitDag {
                 cid,

watcher/Cargo.toml

@@ -6,15 +6,17 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow.workspace = true
 config.workspace = true
+env_logger = { workspace = true, optional = true }
 log.workspace = true
+messages.workspace = true
 notify = "6.0.1"
 smalog = { workspace = true, optional = true }
-tracing = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true }
+transports.workspace = true
 
 [features]
 big = ["good_log"]
 small = ["small_log"]
-good_log = ["dep:tracing", "dep:tracing-subscriber"]
+good_log = ["dep:env_logger"]
 small_log = ["dep:smalog"]