litmus_paper 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d66e516c05b1928cca5f319524f41b6578b885
-  data.tar.gz: a6f9aed4e14be636749bfa4536bc295044481704
+  metadata.gz: a52459b0af44d8070aa4f9540928e6e4f119e16f
+  data.tar.gz: 94f289b53c8bc488cc4ffb49d3dac9ffd976a1fa
 SHA512:
-  metadata.gz: 18c970635472e70bb906be5f2be7fa126dcb6c134ca0a5a606239da7f25a0ec24f4aa6f0f36acf9cbdbff07dcdf66c04397e85b947d723e4f1561f3577fe03ef
-  data.tar.gz: 701a21b78fbd8b7e528e074bf1d18e8131b1f4d60a807d4c1fc781fc9afcab2efe3bcb3d9d4a1bf36c2aeeec77fae8d47c8e60bec6d12840b3ce307a180b778d
+  metadata.gz: 5ea42940af0dd06f8a4cbbe9506c7c65689073634a0d35aaa6980db8e37a99cdad516b623090c747b1e959fe7526248d84e076f8bc1e4e5ac9e1b7d5bd90a96b
+  data.tar.gz: a898999804de640f8527901f79fcb94661096406625f01964728bfec650e78df743a00dae9c687244b5516ed6f6644ee85ba713444eed08a1a031139b8b7ac12

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p194
+2.6.5

data/Dockerfile

@@ -1,20 +1,52 @@
-FROM debian:stretch
+FROM debian:buster-slim
+
 EXPOSE 9293/TCP
-EXPOSE 9294/TCP
-WORKDIR /home/litmus_paper
-RUN apt-get update && apt-get install -y ruby ruby-dev git curl rsyslog build-essential
-RUN gem install --no-ri --no-rdoc bundler \
-  && gem install sinatra --no-ri --no-rdoc --version "~> 1.3.2" \
-  && gem install remote_syslog_logger --no-ri --no-rdoc --version "~> 1.0.3" \
-  && gem install unicorn --no-ri --no-rdoc --version "~> 4.6.2" \
-  && gem install colorize --no-ri --no-rdoc \
-  && gem install rspec --no-ri --no-rdoc --version "~> 2.9.0" \
-  && gem install rack-test --no-ri --no-rdoc --version "~> 0.6.1" \
-  && gem install rake --no-ri --no-rdoc --version "~> 0.9.2.2" \
-  && gem install rake_commit --no-ri --no-rdoc --version "~> 0.13"
-ADD . /home/litmus_paper
-RUN ln -sf /home/litmus_paper/docker/litmus.conf /etc/litmus.conf \
-  && ln -sf /home/litmus_paper/docker/litmus_unicorn.rb /etc/litmus_unicorn.rb
+
+ENV APP_USER litmus_paper
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ruby \
+    ruby-dev \
+    bundler \
+    git \
+    curl \
+    rsyslog \
+    procps \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create non-root user
+RUN addgroup --gid 1000 --system $APP_USER && \
+    adduser --uid 1000 --ingroup $APP_USER --system $APP_USER
+
+ENV GEM_HOME /usr/local/bundle
+ENV BUNDLE_APP_CONFIG $GEM_HOME
+ENV PATH $GEM_HOME/bin:$PATH
+
+ADD litmus_paper.gemspec /home/$APP_USER/
+ADD lib/litmus_paper/version.rb /home/$APP_USER/lib/litmus_paper/version.rb
+ADD Gemfile* /home/$APP_USER/
+
+WORKDIR /home/$APP_USER
+
+RUN bundle config --global frozen 1 && \
+  bundle install \
+  -j2 \
+  --retry 3 \
+  # Remove unneeded files (cached *.gem, *.o, *.c)
+  && rm -rf /usr/local/bundle/cache/*.gem \
+  && find /usr/local/bundle/gems/ -name "*.c" -delete \
+  && find /usr/local/bundle/gems/ -name "*.o" -delete
+
+ADD . /home/$APP_USER
+RUN ln -sf /home/$APP_USER/docker/litmus.conf /etc/litmus.conf \
+  && ln -sf /home/$APP_USER/docker/litmus_unicorn.rb /etc/litmus_unicorn.rb
 RUN gem build litmus_paper.gemspec && gem install litmus_paper*.gem
+RUN chown -R $APP_USER:$APP_USER /home/$APP_USER
+
+# Drop to app user
+USER $APP_USER
 
 CMD ["bin/litmus", "-p", "9293", "-c", "/etc/litmus_unicorn.rb"]

data/docker/litmus.conf

@@ -1,4 +1,4 @@
-port 9292
+port 9293
 data_directory '/tmp/litmus_paper'
 cache_location '/tmp/litmus_paper_cache'
 cache_ttl -1

data/docker/litmus_unicorn.rb

@@ -1,10 +1,7 @@
 # vim: set ft=ruby
 require 'remote_syslog_logger'
 
-APP_ROOT = '/var/lib/gems/2.3.0/gems/litmus_paper-1.1.1'
-
 worker_processes 5
-working_directory APP_ROOT
 
 logger(RemoteSyslogLogger.new('127.0.0.1', 514, :program => 'litmus_paper', :facility => 'daemon'))
 

data/lib/litmus_paper/metric/haproxy_backends_health.rb

@@ -23,6 +23,13 @@ module LitmusPaper
           .inject(0) { |sum, server| sum + server["weight"].to_f }
 
         ((up_weight / total_weight) * @weight).to_i
+
+      rescue Timeout::Error
+        LitmusPaper.logger.info("HAProxy available check timed out for #{@cluster}")
+        0
+      rescue => e
+        LitmusPaper.logger.info("HAProxy available check failed for #{@cluster} with #{e.message}")
+        0
       end
 
       def stats

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/litmus_paper/app_spec.rb

@@ -60,6 +60,16 @@ describe LitmusPaper::App do
       last_response.body.should include('Forcing health')
       last_response.body.should include('88')
     end
+
+    it "returns successfully if a haproxy backend socket is unreachable" do
+      LitmusPaper.services['test'] = LitmusPaper::Service.new('test', [], [LitmusPaper::Metric::HaproxyBackendsHealth.new(100, "/tmp/non-existant-socketfile", "haproxy")])
+
+      get "/"
+
+      last_response.status.should == 200
+      last_response.body.should include('test')
+      last_response.body.should include('0')
+    end
   end
 
   describe "POST /up" do

data/spec/litmus_paper/metric/haproxy_backends_health_spec.rb

@@ -28,6 +28,11 @@ describe LitmusPaper::Metric::HaproxyBackendsHealth do
       health = LitmusPaper::Metric::HaproxyBackendsHealth.new(50, "/tmp/stub-haproxy-stats", "yellow_cluster")
       health.current_health.should == 16
     end
+
+    it "should return a health of 0 if haproxy is not running" do
+      health = LitmusPaper::Metric::HaproxyBackendsHealth.new(100, "/tmp/non-existant-socketfile", "red_cluster")
+      health.current_health.should == 0
+    end
   end
 
   describe "#to_s" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Braintreeps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra