diff --git a/.ruby-version b/.ruby-version index ec1cf33c3..57cf282eb 100755 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.3 +2.6.5 diff --git a/Gemfile b/Gemfile index 1fae99a97..35f82ff56 100755 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" -ruby "~> 2.6.3" +ruby "~> 2.6.5" gem "active_model_serializers" gem "bunny" diff --git a/app/lib/log_service.rb b/app/lib/log_service.rb index 44fe3990c..6a577f4b2 100644 --- a/app/lib/log_service.rb +++ b/app/lib/log_service.rb @@ -7,7 +7,8 @@ class LogService < AbstractServiceRunner T.new(1.hour) => 0.5 * 10_000, T.new(1.day) => 0.5 * 100_000 - LOG_TPL = "FBOS LOG (device_%s): %s" + LOG_TPL = Rails.env.test? ? + "\e[32m.\e[0m" : "FBOS LOG (device_%s): %s\n" ERR_TPL = "MALFORMED LOG CAPTURE: %s" def process(delivery_info, payload) @@ -34,7 +35,7 @@ class LogService < AbstractServiceRunner dev, log = [data.device, data.payload] dev.maybe_unthrottle Log.deliver(dev, Logs::Create.run!(log, device: dev)) - puts LOG_TPL % [data.device_id, data.payload["message"] || "??"] + print LOG_TPL % [data.device_id, data.payload["message"] || "??"] rescue => x Rollbar.error(x) end diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile index ee7800024..abc17d481 100644 --- a/docker_configs/api.Dockerfile +++ b/docker_configs/api.Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.3 +FROM ruby:2.6.5 RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - RUN sh -c 'VERSION_CODENAME=stretch; . /etc/os-release; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' RUN apt-get update -qq && apt-get install -y build-essential libpq-dev \