Merge branch 'dev' into issue-260-preserve-original-error-message

Author: elpiel

adapter/Cargo.toml

@@ -32,4 +32,4 @@ futures = { version = "0.3.1", features = ["compat"] }
 
 [dev-dependencies]
 byteorder = "1.3"
-tokio = { version = "0.2", features = ["macros", "rt-core"] }
+tokio = { version = "0.2", features = ["macros", "rt-threaded"] }

sentry/Cargo.toml

@@ -16,13 +16,13 @@ hex = "0.3.2"
 # CLI
 clap = "2.33.0"
 # Server
-tokio = { version = "0.2.9", features = ["macros", "rt-core"] }
+tokio = { version = "0.2.9", features = ["macros", "rt-threaded"] }
 hyper = { version = "0.13", features = ["stream"] }
 regex = "1"
 # Database
-redis = { version = "0.14", features = ["tokio-rt-core"] }
-bb8 = { git = "https://github.com/khuey/bb8" }
-bb8-postgres = { git = "https://github.com/khuey/bb8", features = ["with-chrono-0_4", "with-serde_json-1"] }
+redis = "0.15"
+bb8 = "0.4"
+bb8-postgres = { version = "0.4", features = ["with-chrono-0_4", "with-serde_json-1"] }
 
 # Migrations
 migrant_lib = { version = "0.27", features = ["d-postgres"] }

sentry/src/db.rs

@@ -36,7 +36,9 @@ lazy_static! {
 
 pub async fn redis_connection() -> Result<MultiplexedConnection, RedisError> {
     let client = redis::Client::open(REDIS_URL.as_str()).expect("Wrong redis connection url");
-    client.get_multiplexed_tokio_connection().await
+    let (connection, driver) = client.get_multiplexed_async_connection().await?;
+    tokio::spawn(driver);
+    Ok(connection)
 }
 
 pub async fn postgres_connection() -> Result<DbPool, bb8_postgres::tokio_postgres::Error> {

sentry/src/lib.rs

@@ -60,8 +60,7 @@ lazy_static! {
     static ref ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
     static ref ADVERTISER_ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/for-advertiser/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
     static ref PUBLISHER_ANALYTICS_BY_CHANNEL_ID: Regex = Regex::new(r"^/analytics/for-publisher/0x([a-zA-Z0-9]{64})/?$").expect("The regex should be valid");
-    static ref CREATE_EVENTS_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/events(/.*)?$").expect("The regex should be valid");
-
+    static ref CREATE_EVENTS_BY_CHANNEL_ID: Regex = Regex::new(r"^/channel/0x([a-zA-Z0-9]{64})/events/?$").expect("The regex should be valid");
 }
 
 fn auth_required_middleware<'a, A: Adapter>(
@@ -253,7 +252,16 @@ async fn channels_router<A: Adapter + 'static>(
     let (path, method) = (req.uri().path().to_owned(), req.method());
 
     // regex matching for routes with params
-    if let (Some(caps), &Method::GET) = (LAST_APPROVED_BY_CHANNEL_ID.captures(&path), method) {
+    if let (Some(caps), &Method::POST) = (CREATE_EVENTS_BY_CHANNEL_ID.captures(&path), method) {
+        let param = RouteParams(vec![caps
+            .get(1)
+            .map_or("".to_string(), |m| m.as_str().to_string())]);
+
+        req.extensions_mut().insert(param);
+
+        insert_events(req, app).await
+    } else if let (Some(caps), &Method::GET) = (LAST_APPROVED_BY_CHANNEL_ID.captures(&path), method)
+    {
         let param = RouteParams(vec![caps
             .get(1)
             .map_or("".to_string(), |m| m.as_str().to_string())]);
@@ -332,16 +340,6 @@ async fn channels_router<A: Adapter + 'static>(
         let req = chain(req, app, vec![Box::new(channel_load)]).await?;
 
         list_channel_event_aggregates(req, app).await
-    } else if let (Some(caps), &Method::POST) =
-        (CREATE_EVENTS_BY_CHANNEL_ID.captures(&path), method)
-    {
-        let param = RouteParams(vec![caps
-            .get(1)
-            .map_or("".to_string(), |m| m.as_str().to_string())]);
-
-        req.extensions_mut().insert(param);
-
-        insert_events(req, app).await
     } else {
         Err(ResponseError::NotFound)
     }