litmus_paper 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a52459b0af44d8070aa4f9540928e6e4f119e16f
-  data.tar.gz: 94f289b53c8bc488cc4ffb49d3dac9ffd976a1fa
+SHA256:
+  metadata.gz: e1c48dbe7a39abd27341207056934ec3e486a07c6fa510b77d8dfe18d98e1388
+  data.tar.gz: 1c2076dc0c76f6174a69c2e3a93a1e6d89e45d66646f109088ab9f02151db3b9
 SHA512:
-  metadata.gz: 5ea42940af0dd06f8a4cbbe9506c7c65689073634a0d35aaa6980db8e37a99cdad516b623090c747b1e959fe7526248d84e076f8bc1e4e5ac9e1b7d5bd90a96b
-  data.tar.gz: a898999804de640f8527901f79fcb94661096406625f01964728bfec650e78df743a00dae9c687244b5516ed6f6644ee85ba713444eed08a1a031139b8b7ac12
+  metadata.gz: ab98209fec2123b0c77a30da44e029d5e2f86bd5f0fb8e8fdbde74b1ab3f5d1f19e568655d184bec05e77b8228324fca8acae55769baa1d485139b86b05b8330
+  data.tar.gz: 7926a582ac8b8aefb4f6b18d381b315ae9bfa01b8c921a87db83a896ca2b803fa59c11169b7548d37c619e04a92ef42c3f30012672951c1849ffaacc2b5b67f2

data/Dockerfile

@@ -1,8 +1,9 @@
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 EXPOSE 9293/TCP
 
 ENV APP_USER litmus_paper
+ENV SSL_CERT_FILE=/home/${APP_USER}/combined_cacerts.pem
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
@@ -19,19 +20,22 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # Create non-root user
 RUN addgroup --gid 1000 --system $APP_USER && \
-    adduser --uid 1000 --ingroup $APP_USER --system $APP_USER
+    adduser --disabled-password --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/
+COPY --chown=$APP_USER:$APP_USER litmus_paper.gemspec /home/$APP_USER/
+COPY --chown=$APP_USER:$APP_USER lib/litmus_paper/version.rb /home/$APP_USER/lib/litmus_paper/version.rb
+COPY --chown=$APP_USER:$APP_USER Gemfile* /home/$APP_USER/
+COPY --chown=$APP_USER:$APP_USER . /home/$APP_USER
 
 WORKDIR /home/$APP_USER
 
-RUN bundle config --global frozen 1 && \
+COPY combined_cacerts.pem /home/${APP_USER}/combined_cacerts.pem
+RUN git config --global --add safe.directory /home/litmus_paper
+RUN bundle config --global silence_root_warning true frozen 1 && \
   bundle install \
   -j2 \
   --retry 3 \
@@ -40,7 +44,6 @@ RUN bundle config --global frozen 1 && \
   && 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

data/README.md

@@ -203,15 +203,18 @@ There are no additional configuration files for the agent check, since all optio
 
 ```
 Usage: litmus-agent-check [options]
-    -s, --service SERVICE:PORT,...   agent-check service to port mappings
+    -s, --service SERVICE:PORT,...   agent-check service to port mappings (multi-port mode)
     -c, --config CONFIG              Path to litmus paper config file
     -p, --pid-file PID_FILE          Where to write the pid
+    -P, --port PORT                  Port for agent check. Can be used with HAProxy 1.7+ with agent-send directive (single-port mode)
     -w, --workers WORKERS            Number of worker processes
     -D, --daemonize                  Daemonize the process
     -h, --help                       Help text
 ```
 
-The service:port argument means that the server will expose the data from the litmus check for `service` on `port` in HAProxy agent check format. For example, if you wanted to serve status information about `myapp` on port `8080`, and already had a service config for it, you'd pass `-s myapp:8080`.
+In single-port mode, the `-P` or `--port` argument specifies the port that the server will expose the data for all services litmus is configured for on `port` in HAProxy agent check format. This can be used on HAProxy 1.7+ with the `agent-send` directive to specify a backend name to be sent by HAProxy and have litmus paper do the lookup. For example, `agent-send "my_service\n"`.
+
+In multi-port mode, the service:port argument means that the server will expose the data from the litmus check for `service` on `port` in HAProxy agent check format. For example, if you wanted to serve status information about `myapp` on port `8080`, and already had a service config for it, you'd pass `-s myapp:8080`.
 
 On the HAProxy server, add `agent-check agent-port 8080 agent-inter <seconds>s` to the config line for each server listed for that backend. This tells HAProxy to query port 8080 on the backend every `<seconds>` seconds for health information. See the [HAProxy agent check documentation](https://cbonte.github.io/haproxy-dconv/1.8/configuration.html#5.2-agent-check) for more details.
 

data/lib/litmus_paper/agent_check_handler.rb

@@ -8,6 +8,10 @@ module LitmusPaper
       )
       output = []
 
+      if !service
+        return "failed#BAD_INPUT"
+      end
+
       health = @cache.get(service)
       if !health
         @cache.set(

data/lib/litmus_paper/agent_check_server.rb

@@ -5,42 +5,28 @@ require 'socket'
 require 'litmus_paper/agent_check_handler'
 
 module LitmusPaper
-  class AgentCheckServer
-    CRLF = "\r\n"
+  module AgentCheckServer
+    CRLF = "\r\n".freeze
 
-    def initialize(litmus_paper_config, services, workers, pid_file, daemonize)
+    attr_reader :control_sockets, :pid_file, :workers
+
+    def initialize(litmus_paper_config, daemonize, pid_file, workers)
       LitmusPaper.configure(litmus_paper_config)
-      @services = services
-      @workers = workers
-      @pid_file = pid_file
       @daemonize = daemonize
-      @control_sockets = @services.keys.map do |port|
-        TCPServer.new(port)
-      end
+      @pid_file = pid_file
+      @workers = workers
+
       trap(:INT) { exit }
       trap(:TERM) { exit }
     end
 
-    # Stolen pattern from ruby Socket, modified to return the service based on
-    # the accepting port
-    def accept_loop(sockets)
-      if sockets.empty?
-        raise ArgumentError, "no sockets"
-      end
-      loop {
-        readable, _, _ = IO.select(sockets)
-        readable.each { |r|
-          begin
-            sock, addr = r.accept_nonblock
-            _, remote_port, _, remote_ip = sock.peeraddr
-            LitmusPaper.logger.debug "Received request from #{remote_ip}:#{remote_port}"
-            service = @services[r.local_address.ip_port]
-          rescue IO::WaitReadable
-            next
-          end
-          yield sock, service
-        }
-      }
+    def daemonize?
+      !!@daemonize
+    end
+
+
+    def service_for_socket(socket)
+      raise "Consumers must implemented service_for_socket(socket)"
     end
 
     def respond(sock, message)
@@ -55,13 +41,13 @@ module LitmusPaper
     end
 
     def run
-      if @daemonize
+      if daemonize?
         Process.daemon
       end
-      write_pid(@pid_file)
+      write_pid(pid_file)
       child_pids = []
 
-      @workers.times do
+      workers.times do
         child_pids << spawn_child
       end
 
@@ -72,7 +58,7 @@ module LitmusPaper
           rescue Errno::ESRCH
           end
         end
-        File.delete(@pid_file) if File.exists?(@pid_file)
+        File.delete(pid_file) if File.exists?(pid_file)
         exit
       }
 
@@ -89,9 +75,16 @@ module LitmusPaper
 
     def spawn_child
       fork do
-        accept_loop(@control_sockets) do |sock, service|
-          respond(sock, AgentCheckHandler.handle(service))
-          sock.close
+        Socket.accept_loop(control_sockets) do |sock, addr|
+          _, remote_port, _, remote_ip = sock.peeraddr(:numeric)
+
+          begin
+            service = service_for_socket(sock)
+            respond(sock, AgentCheckHandler.handle(service))
+            sock.close
+          rescue Errno::ECONNRESET, Errno::EPIPE, Errno::ENOTCONN
+            LitmusPaper.logger.debug "Received request from #{remote_ip}:#{remote_port}, but client hung up."
+          end
         end
       end
     end

data/lib/litmus_paper/cli/agent_check.rb

@@ -1,5 +1,6 @@
 require 'optparse'
-require 'litmus_paper/agent_check_server'
+require 'litmus_paper/single_port_agent_server'
+require 'litmus_paper/multi_port_agent_server'
 
 module LitmusPaper
   module CLI
@@ -9,7 +10,7 @@ module LitmusPaper
         options = {}
         options[:pid_file] = '/tmp/litmus-agent-check.pid'
         optparser = OptionParser.new do |opts|
-          opts.on("-s", "--service SERVICE:PORT,...", Array, "agent-check service to port mappings") do |s|
+          opts.on("-s", "--service SERVICE:PORT,...", Array, "agent-check service to port mappings (multi-port mode)") do |s|
             options[:services] = s
           end
           opts.on("-c", "--config CONFIG", "Path to litmus paper config file") do |c|
@@ -18,6 +19,9 @@ module LitmusPaper
           opts.on("-p", "--pid-file PID_FILE", String, "Where to write the pid") do |p|
             options[:pid_file] = p
           end
+          opts.on("-P", "--port PORT", Integer, "Port for agent check. Can be used with HAProxy 1.7+ with agent-send directive (single-port mode)") do |port|
+            options[:port] = port
+          end
           opts.on("-w", "--workers WORKERS", Integer, "Number of worker processes") do |w|
             options[:workers] = w
           end
@@ -42,8 +46,12 @@ module LitmusPaper
           exit 0
         end
 
-        if !options.has_key?(:services)
-          puts "Error: `-s SERVICE:PORT,...` required"
+        if !options.has_key?(:services) && !options.has_key?(:port)
+          puts "Error: `-s SERVICE:PORT,...` or `-P PORT` required"
+          puts optparser
+          exit 1
+        elsif options.has_key?(:services) && options.has_key?(:port)
+          puts "Error: `-s` and `-P` are mutually exclusive and cannot be specified together"
           puts optparser
           exit 1
         end
@@ -56,15 +64,17 @@ module LitmusPaper
           exit 1
         end
 
-        options[:services] = options[:services].reduce({}) do |memo, service|
-          if service.split(':').length == 2
-            service, port = service.split(':')
-            memo[port.to_i] = service
-            memo
-          else
-            puts "Error: Incorrect service port arg `-s SERVICE:PORT,...`"
-            puts optparser
-            exit 1
+        if options.has_key?(:services)
+          options[:services] = options[:services].reduce({}) do |memo, service|
+            if service.split(':').length == 2
+              service, port = service.split(':')
+              memo[port.to_i] = service
+              memo
+            else
+              puts "Error: Incorrect service port arg `-s SERVICE:PORT,...`"
+              puts optparser
+              exit 1
+            end
           end
         end
 
@@ -73,13 +83,25 @@ module LitmusPaper
 
       def run(args)
         options = parse_args(args)
-        agent_check_server = LitmusPaper::AgentCheckServer.new(
-          options[:litmus_paper_config],
-          options[:services],
-          options[:workers],
-          options[:pid_file],
-          options[:daemonize],
-        )
+
+        if options.has_key?(:port)
+          agent_check_server = LitmusPaper::SinglePortAgentServer.new(
+            options[:litmus_paper_config],
+            options[:daemonize],
+            options[:pid_file],
+            options[:port],
+            options[:workers],
+          )
+        else
+          agent_check_server = LitmusPaper::MultiPortAgentServer.new(
+            options[:litmus_paper_config],
+            options[:daemonize],
+            options[:pid_file],
+            options[:services],
+            options[:workers],
+          )
+        end
+
         agent_check_server.run
       end
 

data/lib/litmus_paper/metric/tcp_socket_utilization.rb

@@ -20,7 +20,7 @@ module LitmusPaper
         queued = current_stats[:socket_queued]
         utilization = current_stats[:socket_utilization]
 
-        "Metric::TcpSocketUtilitization(weight: #{weight}, maxconn: #{maxconn}, active: #{active}, queued: #{queued}, utilization: #{utilization}, address: #{address})"
+        "Metric::TcpSocketUtilization(weight: #{weight}, maxconn: #{maxconn}, active: #{active}, queued: #{queued}, utilization: #{utilization}, address: #{address})"
       end
     end
   end

data/lib/litmus_paper/metric/unix_socket_utilization.rb

@@ -25,7 +25,7 @@ module LitmusPaper
     end
 
     def self.const_missing(const_name)
-      super unless const_name == :UnixSocketUtilitization
+      return super unless const_name == :UnixSocketUtilitization
       warn "`LitmusPaper::Metric::UnixSocketUtilitization` has been deprecated. Use `LitmusPaper::Metric::UnixSocketUtilization` instead."
       UnixSocketUtilization
     end

data/lib/litmus_paper/multi_port_agent_server.rb

@@ -0,0 +1,23 @@
+require 'litmus_paper/agent_check_server'
+
+module LitmusPaper
+  class MultiPortAgentServer
+    include AgentCheckServer
+
+    attr_reader :services
+
+    def initialize(litmus_paper_config, daemonize, pid_file, services, workers)
+      super(litmus_paper_config, daemonize, pid_file, workers)
+      @services = services
+      @control_sockets = @services.keys.map do |port|
+        TCPServer.new(port)
+      end
+    end
+
+    def service_for_socket(socket)
+      _, remote_port, _, remote_ip = socket.peeraddr(:numeric)
+      LitmusPaper.logger.debug "Received request from #{remote_ip}:#{remote_port}"
+      services[socket.local_address.ip_port]
+    end
+  end
+end

data/lib/litmus_paper/single_port_agent_server.rb

@@ -0,0 +1,29 @@
+require 'litmus_paper/agent_check_server'
+
+module LitmusPaper
+  class SinglePortAgentServer
+    include AgentCheckServer
+
+    VALID_NAME_REGEX = /\A[A-Za-z0-9_:.-]+\z/.freeze
+
+    def initialize(litmus_paper_config, daemonize, pid_file, port, workers)
+      super(litmus_paper_config, daemonize, pid_file, workers)
+      @control_sockets = [TCPServer.new(port)]
+    end
+
+    def service_for_socket(socket)
+      _, remote_port, _, remote_ip = socket.peeraddr(:numeric)
+
+      msg = socket.gets
+
+      if msg && (m = msg.chomp.match(VALID_NAME_REGEX))
+        backend_name = m[0]
+        LitmusPaper.logger.info "Received request from #{remote_ip}:#{remote_port} for '#{backend_name}'"
+        backend_name
+      else
+        LitmusPaper.logger.error "Received request from #{remote_ip}:#{remote_port}, but backend name could not be read."
+        nil
+      end
+    end
+  end
+end

data/lib/litmus_paper/version.rb

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

data/spec/litmus_paper/{agent_check_server_spec.rb → multi_port_agent_server_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'litmus_paper/agent_check_server'
+require 'litmus_paper/multi_port_agent_server'
 
-describe LitmusPaper::AgentCheckServer do
+describe LitmusPaper::MultiPortAgentServer do
   pid = nil
 
   before :all do

data/spec/litmus_paper/single_port_agent_server_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+require 'litmus_paper/single_port_agent_server'
+
+describe LitmusPaper::SinglePortAgentServer do
+  pid = nil
+
+  before :all do
+    if ! Kernel.system("bundle exec litmus-agent-check -P 9191 -c spec/support/test.config -w 10 -D")
+      fail('Unable to start server')
+    end
+    port_open = false
+    while ! port_open do
+      begin
+        TCPSocket.new('127.0.0.1', 9191)
+      rescue StandardError => e
+        sleep 0.1
+        next
+      end
+      port_open = true
+    end
+  end
+
+  after :all do
+    Process.kill(:TERM, File.read('/tmp/litmus-agent-check.pid').to_i)
+  end
+
+  describe "The agent-check text protocol" do
+    it "returns the health from a passing test" do
+      TCPSocket.open('127.0.0.1', 9191) do |s|
+        s.puts "passing_test"
+        s.gets.should match(/ready\tup\t\d+%\r\n/)
+      end
+    end
+    it "returns the health from a failing test" do
+      TCPSocket.open('127.0.0.1', 9191) do |s|
+        s.puts "test"
+        s.gets.should match(/down\t0%\r\n/)
+      end
+    end
+    it "returns a failure for a non-existent service" do
+      TCPSocket.open('127.0.0.1', 9191) do |s|
+        s.puts "foo"
+        s.gets.should match(/failed#NOT_FOUND\r\n/)
+      end
+    end
+    it "returns a failure for a bad message" do
+      TCPSocket.open('127.0.0.1', 9191) do |s|
+        s.puts "\n"
+        s.gets.should match(/failed#BAD_INPUT\r\n/)
+      end
+    end
+  end
+
+  describe "server" do
+    it "has the configured number of children running" do
+      pid = File.read('/tmp/litmus-agent-check.pid').to_i
+      children = `ps --no-headers --ppid #{pid}|wc -l`
+      children.strip.to_i == 10
+    end
+
+    it "doesn't crash if a client hangs up" do
+      pid = File.read('/tmp/litmus-agent-check.pid').to_i
+      child_pids = `ps --no-headers --ppid #{pid}|wc -l`
+      original_pids = `pgrep -P #{pid}`.chomp.split("\n")
+
+      TCPSocket.open('127.0.0.1', 9191) do |s|
+        # Do nothing (e.g. haproxy w/o agent-send setup correctly)
+      end
+
+      sleep 0.5
+
+      current_pids = `pgrep -P #{pid}`.chomp.split("\n")
+      current_pids.should eql(original_pids)
+    end
+
+    it "if a child dies you get a new one" do
+      pid = File.read('/tmp/litmus-agent-check.pid').to_i
+      Kernel.system("kill -9 $(ps --no-headers --ppid #{pid} -o pid=|tail -1)")
+      sleep 0.5
+      children = `ps --no-headers --ppid #{pid}|wc -l`
+      children.strip.to_i == 10
+    end
+  end
+end

data/spec/ssl/server.crt

@@ -1,18 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

data/spec/ssl/server.key

@@ -1,15 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCmpQmuHxNzNUv0VGibVMzUJD/c9+JipDYI20kzdmnDeDrWDw86
-aCtScTFshQD+HsKfUjPMhNfkiIQ/iiuwSWuBz5P7oTgMYEDWY6lsU/cCWkhX3T5w
-AgO5kTq2uDF5bQ6Od5KIaZJH6C81jsHwcDUdXfx4hidvRaUs5etJM7Y7SwIDAQAB
-AoGAAngRg6XsONnCTVVu01ZXTpFW7OQzU3jRYCI3nG6VtJK0dHV2qUvf0HHi5JO3
-5wv3oDqsj8wsErO/Gd3nNc5wrE6S1qGIRU/1wvVbEgB2AIGYuXuGLyR9nrUkwjHp
-ztPIBtl0cgapSSQxYAQ2Apu/aQCaP3l4IKUdktYBKO7CkJkCQQDS9iCKGNV+Xz8X
-0flPJ3yKBndLr1g4sbEacGA/+V/CHhWyKk6RXjWOUTCTPECi2eyg3WJaGnq32BTN
-DEZ6YJgtAkEAyjjTWMut/UfoNF6a8++yNjo17JrH/MtCAEphXZcUxEmubYkODR0v
-wNELrstWOfkuGVTZm618RHM0J6LqfVsUVwJBAJ4CaeblqOrpbjlqNUDbQ4WiSDIx
-GHQGa69w4jaoktezbu6uj4CEPrrlBuwQ4hzX+0uV5fe1A5u1xga7HgLFXNUCQA0d
-8H+S/p8uOd6jwFNQWfPwhKzrQUuhd4+DQ5uJgDxXNyw9tp6dJQrRxHs7D0XFZvsX
-qOHTN/tMqbZkd+dXsBMCQQCgLIW0Og3LHubDCn9jNoz21Achi2kwI5AOXEnyHL2W
-XvjJH6PM3/d9TpUVYCoj8PO5WoXCSt1DVpZ5ow28ad6M
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+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
+zzAeg1BIeBWTl87fSL/BKR7l3LtFMbU=
+-----END PRIVATE KEY-----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Braintreeps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -192,7 +192,9 @@ files:
 - lib/litmus_paper/metric/socket_utilization.rb
 - lib/litmus_paper/metric/tcp_socket_utilization.rb
 - lib/litmus_paper/metric/unix_socket_utilization.rb
+- lib/litmus_paper/multi_port_agent_server.rb
 - lib/litmus_paper/service.rb
+- lib/litmus_paper/single_port_agent_server.rb
 - lib/litmus_paper/status_file.rb
 - lib/litmus_paper/terminal_output.rb
 - lib/litmus_paper/util.rb
@@ -201,7 +203,6 @@ files:
 - litmus_paper.gemspec
 - release
 - spec/litmus_paper/agent_check_handler_spec.rb
-- spec/litmus_paper/agent_check_server_spec.rb
 - spec/litmus_paper/app_spec.rb
 - spec/litmus_paper/cache_spec.rb
 - spec/litmus_paper/cli/admin_spec.rb
@@ -220,7 +221,9 @@ files:
 - spec/litmus_paper/metric/script_spec.rb
 - spec/litmus_paper/metric/tcp_socket_utilization_spec.rb
 - spec/litmus_paper/metric/unix_socket_utilization_spec.rb
+- spec/litmus_paper/multi_port_agent_server_spec.rb
 - spec/litmus_paper/service_spec.rb
+- spec/litmus_paper/single_port_agent_server_spec.rb
 - spec/litmus_paper/status_file_spec.rb
 - spec/litmus_paper_spec.rb
 - spec/script/https_test_server.rb
@@ -266,14 +269,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Backend health tester for HA Services, partner project of big_brother
 test_files:
 - spec/litmus_paper/agent_check_handler_spec.rb
-- spec/litmus_paper/agent_check_server_spec.rb
 - spec/litmus_paper/app_spec.rb
 - spec/litmus_paper/cache_spec.rb
 - spec/litmus_paper/cli/admin_spec.rb
@@ -292,7 +293,9 @@ test_files:
 - spec/litmus_paper/metric/script_spec.rb
 - spec/litmus_paper/metric/tcp_socket_utilization_spec.rb
 - spec/litmus_paper/metric/unix_socket_utilization_spec.rb
+- spec/litmus_paper/multi_port_agent_server_spec.rb
 - spec/litmus_paper/service_spec.rb
+- spec/litmus_paper/single_port_agent_server_spec.rb
 - spec/litmus_paper/status_file_spec.rb
 - spec/litmus_paper_spec.rb
 - spec/script/https_test_server.rb