From 2b0fe78b38dfe2a2e6806816ac107e845e05f5c9 Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Sat, 24 Aug 2024 15:36:59 +0200 Subject: [PATCH] pass clippy --- Makefile | 9 ++++++--- src/reccord.rs | 16 +++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 84e0a5a..0e4f40a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ deploy: - ssh raspiwork 'cd /home/pi/Scripts/rust_mosquitto && git pull && cargo build --release' - ssh raspiwork 'sudo systemctl daemon-reload' - ssh raspiwork 'sudo systemctl restart rust_mosquitto.service' + ssh raspiwork 'cd /home/pi/Scripts/rust_mosquitto && git pull && make build' + +build: + cargo build --release + sudo systemctl daemon-reload + sudo systemctl restart rust_mosquitto.service \ No newline at end of file diff --git a/src/reccord.rs b/src/reccord.rs index 6aafe46..72ce68a 100644 --- a/src/reccord.rs +++ b/src/reccord.rs @@ -1,7 +1,7 @@ +use dotenv::dotenv; use mysql::prelude::*; use mysql::*; use std::env; -use dotenv::dotenv; #[derive(Debug, PartialEq, Eq)] struct MosquittoMessage { @@ -16,10 +16,16 @@ pub fn message(message: paho_mqtt::Message) { let db_user = env::var("DB_USER").expect("DB_USER must be set"); let db_password = env::var("DB_PASSWORD").expect("DB_PASSWORD must be set"); let db_host = env::var("DB_HOST").expect("DB_HOST must be set"); - let db_port: u16 = env::var("DB_PORT").expect("DB_PORT must be set").parse().unwrap(); + let db_port: u16 = env::var("DB_PORT") + .expect("DB_PORT must be set") + .parse() + .unwrap(); let db_name = env::var("DB_NAME").expect("DB_NAME must be set"); - let url_builder = format!("mysql://{}:{}@{}:{}/{}", db_user, db_password, db_host, db_port, db_name); + let url_builder = format!( + "mysql://{}:{}@{}:{}/{}", + db_user, db_password, db_host, db_port, db_name + ); let url = Opts::from_url(url_builder.as_str()).unwrap(); let pool = Pool::new(url).unwrap(); let mut conn = pool.get_conn().unwrap(); @@ -27,7 +33,7 @@ pub fn message(message: paho_mqtt::Message) { let split: Vec<&str> = message.topic().split("/").collect(); let data = message.payload_str(); - let message_received = vec![MosquittoMessage { + let message_received = [MosquittoMessage { service: split[0].to_string(), capteur: split[1].to_string(), type_donnee: split[2].to_string(), @@ -47,5 +53,5 @@ pub fn message(message: paho_mqtt::Message) { }), ); - println!("topic : {:?} data : {}", split, data.to_string()); + //println!("topic : {:?} data : {}", split, data.to_string()); }