fix: add logger to /:id/events

samparsky · samparsky · commit 7f9b089175dd · 2020-01-21T11:48:10.000+01:00
diff --git a/sentry/src/db/event_aggregate.rs b/sentry/src/db/event_aggregate.rs
@@ -1,6 +1,5 @@
 use crate::db::DbPool;
 use bb8::RunError;
-// use bb8_postgres::tokio_postgres::types::{ToSql, FromSql};
 use bb8_postgres::tokio_postgres::binary_copy::BinaryCopyInWriter;
 use bb8_postgres::tokio_postgres::types::Type;
 use bb8_postgres::tokio_postgres::Error;
diff --git a/sentry/src/event_aggregator.rs b/sentry/src/event_aggregator.rs
@@ -14,6 +14,8 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::time::delay_for;
+use slog::{error, Logger};
+
 
 #[derive(Default, Clone)]
 pub struct EventAggregator {
@@ -31,17 +33,18 @@ pub fn new_aggr(channel_id: &ChannelId) -> EventAggregate {
 async fn store(
     db: &DbPool,
     channel_id: &ChannelId,
+    logger: &Logger,
     aggr: Arc<RwLock<HashMap<String, EventAggregate>>>,
 ) {
     let mut recorder = aggr.write().await;
     let ev_aggr: Option<&EventAggregate> = recorder.get(&channel_id.to_string());
     if let Some(data) = ev_aggr {
         if let Err(e) = insert_event_aggregate(&db, &channel_id, data).await {
-            eprintln!("{}", e);
-            return;
+            error!(&logger, "event-aggregates store error {}", e);
+        } else {
+            // reset aggr
+            recorder.insert(channel_id.to_string(), new_aggr(&channel_id));
         };
-        // reset aggr
-        recorder.insert(channel_id.to_string(), new_aggr(&channel_id));
     }
 }
 
@@ -71,6 +74,7 @@ impl EventAggregator {
         let aggregate = self.aggregate.clone();
         let withdraw_period_start = channel.spec.withdraw_period_start;
         let channel_id = channel.id;
+        let logger = app.logger.clone();
 
         let mut aggr: &mut EventAggregate = match recorder.get_mut(&channel.id.to_string()) {
             Some(aggr) => aggr,
@@ -93,7 +97,7 @@ impl EventAggregator {
                             }
 
                             delay_for(Duration::from_secs(aggr_throttle as u64)).await;
-                            store(&dbpool, &channel_id, aggregate.clone()).await;
+                            store(&dbpool, &channel_id, &logger, aggregate.clone()).await;
                         }
                     });
                 }
@@ -113,12 +117,9 @@ impl EventAggregator {
         drop(recorder);
 
         if aggr_throttle == 0 {
-            println!("storing data in ");
-            store(&app.pool, &channel.id, self.aggregate.clone()).await;
+            store(&app.pool, &channel.id, &app.logger.clone(), self.aggregate.clone()).await;
         }
 
-        println!("finished succesfully");
-
         Ok(())
     }
 }
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -75,7 +75,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {
         .get("true-client-ip")
         .or_else(|| req.headers().get("x-forwarded-for"))
         .and_then(|hv| hv.to_str().map(ToString::to_string).ok())
-        .map(|token| token.split(',').collect::<Vec<&str>>()[0].to_string())
+        .map(|token| token.split(',').nth(0).map(ToString::to_string).expect("should have ip"))
 }
 
 #[cfg(test)]
diff --git a/sentry/src/routes/channel.rs b/sentry/src/routes/channel.rs
@@ -126,9 +126,7 @@ pub async fn insert_events<A: Adapter + 'static>(
     let events = request_body
         .get("events")
         .ok_or_else(|| ResponseError::BadRequest("invalid request".to_string()))?;
-
-    println!("working on something");
-
+    
     app.event_aggregator
         .record(app, &channel, &session, &events.as_slice())
         .await?;

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {`
`75`	`75`	`.get("true-client-ip")`
`76`	`76`	`.or_else(\|\| req.headers().get("x-forwarded-for"))`
`77`	`77`	`.and_then(\|hv\| hv.to_str().map(ToString::to_string).ok())`
`78`		`- .map(\|token\| token.split(',').collect::<Vec<&str>>()[0].to_string())`
	`78`	`+ .map(\|token\| token.split(',').nth(0).map(ToString::to_string).expect("should have ip"))`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`#[cfg(test)]`