Fix token expiration

CHANGELOG.md

@@ -6,13 +6,17 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## 0.2.1 - 2021-06-11
+
+- Fix auth token expiration
+
 ## 0.2.0 - 2021-06-07
 
-- Compleate revamp and updated all dependencies
-- Added State metrics for sds, sdc and device
+- Complete revamp and updated all dependencies
+- Added State metrics for sds, sdc and device (https://github.com/syepes/sio2prom/blob/master/src/sio/metrics.rs#L46)
 - Removed file configuration (sio2prom.json), it's now all done with params or environment vars
 - Removed log file (log4rs.toml), it's now Stdout and managed with -v
-- New docker builds for linux/amd64, linux/arm/v7 and linux/arm64
+- New docker builds for linux/amd64, linux/arm/v7 and linux/arm64 (https://hub.docker.com/r/syepes/sio2prom/tags)
 - Tested with the last versions of PowerFlex (<=3.5)
 
 ## 0.1.3 - 2017-04-23

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sio2prom"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2018"
 resolver = "2"
 authors = ["Sebastian YEPES F <[email protected]>"]

README.md

@@ -30,7 +30,7 @@
     docker run -d --name sio2prom -h sio2prom -e IP=1.1.1.1 -e AUTH_USR=mon -e AUTH_PWD=mon -v $PWD/cfg:/app/cfg/ -p 8080:8080 syepes/sio2prom
 
     # Metrics
-    curl -v -i https://localhost:8080/metrics
+    curl -v -i http://localhost:8080/metrics
 
 ## Usage (Built from src)
 

src/main.rs

@@ -62,7 +62,6 @@ async fn data_collector(app: ArgMatches) {
   let mut collect_interval = tokio::time::interval(Duration::from_secs(interval));
 
   let mut sio = sio::client::ClientInfo::new(app.value_of("ip"), app.value_of("auth_usr"), app.value_of("auth_pwd"));
-  sio.auth().await;
 
   loop {
     let metrics = sio.metrics().await;

src/sio/client.rs

@@ -19,7 +19,7 @@ impl<'a> ClientInfo<'a> {
                  token: RefCell::new(None) }
   }
 
-  pub async fn auth(&mut self) {
+  async fn auth(&mut self) {
     trace!("auth");
     if let Ok(c) = reqwest::Client::builder().user_agent(env!("CARGO_PKG_NAME")).danger_accept_invalid_certs(true).timeout(Duration::from_secs(10)).connection_verbose(true).build() {
       if !self.auth_usr.unwrap().is_empty() && !self.auth_pwd.unwrap().is_empty() {
@@ -93,7 +93,10 @@ impl<'a> ClientInfo<'a> {
                   _ => Err(anyhow!("Failed to parse json")),
                 }
               },
-              StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN => Err(anyhow!("Auth failed")),
+              StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN => {
+                *self.token.borrow_mut() = None;
+                Err(anyhow!("Auth failed"))
+              },
               _ => {
                 let msg = match r.json::<serde_json::Value>().await.unwrap() {
                   Value::Object(m) => m.get("message").unwrap().to_string(),
@@ -534,12 +537,13 @@ impl<'a> ClientInfo<'a> {
 
   // pub fn metrics(&mut self) -> Option<Vec<Metric>> {
   pub async fn metrics(&mut self) -> Option<Vec<super::metrics::Metric>> {
-    let inst = self.instances().await;
-    info!("Loaded instances: {:?}", &inst.as_ref().unwrap().keys().collect::<Vec<_>>());
+    self.auth().await;
 
+    let inst = self.instances().await;
     if inst.is_err() {
       return None;
     }
+    info!("Loaded instances: {:?}", &inst.as_ref().unwrap().keys().collect::<Vec<_>>());
 
     let rela = self.relations(inst.as_ref().unwrap());
     if rela.is_err() {