Merge pull request #83 from shotover/v19andloggingchanges

upversionandfixlogs

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shotover-proxy"
-version = "0.0.18"
+version = "0.0.19"
 authors = ["Ben <ben@instaclustr.com>"]
 edition = "2018"
 

src/main.rs

@@ -2,6 +2,7 @@
 #![recursion_limit = "256"]
 
 use anyhow::{anyhow, Result};
+use clap::crate_version;
 use clap::Clap;
 use metrics_runtime::Receiver;
 use tracing::{debug, info};
@@ -16,7 +17,7 @@ use std::net::SocketAddr;
 use tokio::runtime;
 
 #[derive(Clap)]
-#[clap(version = "0.0.18", author = "Instaclustr")]
+#[clap(version = crate_version!(), author = "Instaclustr")]
 struct ConfigOpts {
     #[clap(short, long, default_value = "config/topology.yaml")]
     pub topology_file: String,
@@ -50,6 +51,7 @@ fn main() -> Result<()> {
         .try_init()
         .map_err(|e| anyhow!("couldn't start logging - {}", e))?;
 
+    info!("Starting Shotover {}", crate_version!());
     info!(
         "Loaded the following configuration file: {}",
         params.config_file

src/server.rs

@@ -326,19 +326,13 @@ where
                         },
                         Err(_) => {
                             match idle_time {
-                                0..=10 => debug!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details),
-                                11..=35 => warn!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details),
+                                0..=10 => trace!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details),
+                                11..=35 => trace!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details),
                                 _ => {
-                                    warn!("Dropping Connection Idle for more than {} seconds {}", idle_time, self.conn_details);
+                                    debug!("Dropping Connection Idle for more than {} seconds {}", idle_time, self.conn_details);
                                     return Ok(())
                                 }
                             }
-
-                            if idle_time > 60 {
-                                warn!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details);
-                            } else {
-                                debug!("Connection Idle for more than {} seconds {}", idle_time, self.conn_details);
-                            }
                             idle_time *= 2;
                             continue
                         }

src/transforms/chain.rs

@@ -12,10 +12,9 @@ use std::sync::Arc;
 use tokio::sync::mpsc::{channel, Receiver, Sender};
 use tokio::sync::oneshot::Receiver as OneReceiver;
 use tokio::sync::Mutex;
-use tokio::time::timeout;
 use tokio::time::Duration;
 use tokio::time::Instant;
-use tracing::{info, trace, warn};
+use tracing::{debug, info, trace, warn};
 
 type InnerChain = Vec<Transforms>;
 
@@ -159,7 +158,7 @@ impl TransformChain {
                 };
             }
 
-            warn!("buffered chain processing thread exiting, stopping chain loop and dropping");
+            debug!("buffered chain processing thread exiting, stopping chain loop and dropping");
         });
 
         BufferedChain {