Merge branch 'hotfix/2.15.3'

getslash · Jan 3, 2019 · de4ea9f · de4ea9f
2 parents b3d0010 + b44b296
commit de4ea9f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/api-server/src/main.rs b/api-server/src/main.rs
@@ -22,7 +22,6 @@ use actix::prelude::*;
 use actix_web::{server, App};
 use env_logger::Builder;
 use log::info;
-use sentry_actix::SentryMiddleware;
 use state::AppState;
 use stats::StatsCollector;
 use std::env;
@@ -55,7 +54,6 @@ fn main() {
 
     let server = server::new(move || {
         App::with_state(AppState::init(stats_collector.clone()))
-            .middleware(SentryMiddleware::new())
             .resource("/metrics/request", |r| {
                 r.post().with(stats::update);
             })

diff --git a/flask_app/tasks/replications.py b/flask_app/tasks/replications.py
@@ -119,6 +119,7 @@ def _get_tests_to_replicate_query(replica, bulk_size=200):
         ).label('test'),
         select([func.array_agg(
             func.json_build_object(
+                'timestamp', models.Error.timestamp,
                 'message', models.Error.message)
         )]).where(models.Error.test_id == models.Test.id).label('errors'),
         select([