memosig 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc87039a61f8c2c0bb212eaf57f1b5a5927f1ea
-  data.tar.gz: 5fd57c20fcd76c16dcfbc8802cd5fcd4885996b9
+  metadata.gz: c880791fc4181394f342e11786014bf822463364
+  data.tar.gz: b62e09190fcc3e8dd8b17b09d9d64199b2efda5d
 SHA512:
-  metadata.gz: ae5dca2ffff020a990897f50950caee7fb004bc38e8a3610704232c4f2890206b5193c918b662413421ad26e6db459b2b6bcda6d41dacdc6bfb880309310d8cb
-  data.tar.gz: 37929e6cc0778ee32d0dc2d82f3ee4acea5d67c93f72357127fbdbbbb277ef2ed7c3153e286701af2431469ff342bdb0df559ed46c8070d8b3104d16ebf9ea38
+  metadata.gz: 4d6dbcea19b281cbc93d074a2c5e9c493e207af94adbf2e704e5e1c447ac2155eef302c1bf62edc72b9657af21d740d241ae9b12315a33ab3d4a3cc4f03ea850
+  data.tar.gz: de76ecef394151e6be0ac1c2f7a8b3920a6f7e76e412b075d9fd77926d7f778ba4250ac5752ed549959938ee47d0e9d4ae5a7b11321b4e7547209d9ba486ee78

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Rakefile

@@ -25,6 +25,7 @@ GemHadar do
   development_dependency 'rake'
   development_dependency 'rspec'
   development_dependency 'simplecov'
+  development_dependency 'byebug'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/memosig/app.rb

@@ -14,7 +14,7 @@ class Memosig::App
 
   def run
     check_memory
-    sleep (@config.wait_period || 300)
+    sleep (@config.wait_period? || 300)
   end
 
   private
@@ -23,14 +23,17 @@ class Memosig::App
     processes.any? do |process|
       Memosig::Matcher.new(pattern, config).match? process
     end and return
-    error "pattern #{pattern.source.inspect} didn't match any processes"
+    error "pattern #{pattern.to_s.inspect} didn't match any processes"
+  end
+
+  def current_processes
+    Memosig::ProcStat.all
   end
 
   def check_memory
     output "checking memory limits"
-    processes = Memosig::ProcStat.all
+    processes = current_processes
     for (pattern, config) in Array(@config.processes)
-      pattern = Regexp.new(pattern.to_s)
       check_memory_for pattern, config, processes
     end
   end

data/lib/memosig/matcher.rb

@@ -4,22 +4,39 @@ class ::Memosig::Matcher
   include Memosig::Output
 
   def initialize(pattern, config)
-    @pattern, @config = pattern, config
+    @pattern, @config = prepare_pattern(pattern), config
   end
 
   def match?(process)
-    if process.command =~ @pattern
-      if process.rss > @config.rss_max
-        output "restarting process pid=#{process.pid} "\
-          "pattern=#{@pattern.source.inspect} "\
-          "rss #{process.rss}>#{@config.rss_max}"
-          Process.kill @config.signal, process.pid
+    @process = process
+    if @process.command =~ @pattern
+      if @process.rss > @config.rss_max
+        take_action
       else
-        output "no action on process pid=#{process.pid} "\
-          "pattern=#{@pattern.source.inspect} "\
-          "rss #{process.rss}<=#{@config.rss_max}"
+        lay_low
       end
-      matched = true
+      true
+    else
+      false
     end
   end
+
+  private
+
+  def prepare_pattern(pattern)
+    Regexp.new(pattern.to_s)
+  end
+
+  def take_action
+    output "sending signal #{@config.signal} to process pid=#{@process.pid} "\
+      "pattern=#{@pattern.source.inspect} "\
+      "rss #{@process.rss}>#{@config.rss_max}"
+    Process.kill @config.signal, @process.pid
+  end
+
+  def lay_low
+    output "no action on process pid=#{@process.pid} "\
+      "pattern=#{@pattern.source.inspect} "\
+      "rss #{@process.rss}<=#{@config.rss_max}"
+  end
 end

data/lib/memosig/version.rb

@@ -1,6 +1,6 @@
 module Memosig
   # Memosig version
-  VERSION         = '0.0.1'
+  VERSION         = '0.0.2'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/memosig.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: memosig 0.0.1 ruby lib
+# stub: memosig 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "memosig"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de"
   s.executables = ["memosig"]
   s.extra_rdoc_files = ["README.md", "lib/memosig.rb", "lib/memosig/app.rb", "lib/memosig/matcher.rb", "lib/memosig/output.rb", "lib/memosig/proc_stat.rb", "lib/memosig/version.rb"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "bin/memosig", "lib/memosig.rb", "lib/memosig/app.rb", "lib/memosig/matcher.rb", "lib/memosig/output.rb", "lib/memosig/proc_stat.rb", "lib/memosig/version.rb", "memosig.gemspec", "spec/assets/memosig.yml", "spec/memosig/app_spec.rb", "spec/memosig/proc_stat_spec.rb", "spec/spec_helper.rb"]
+  s.files = [".gitignore", ".rspec", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "bin/memosig", "lib/memosig.rb", "lib/memosig/app.rb", "lib/memosig/matcher.rb", "lib/memosig/output.rb", "lib/memosig/proc_stat.rb", "lib/memosig/version.rb", "memosig.gemspec", "spec/assets/memosig.yml", "spec/memosig/app_spec.rb", "spec/memosig/matcher_spec.rb", "spec/memosig/output_spec.rb", "spec/memosig/proc_stat_spec.rb", "spec/spec_helper.rb"]
   s.homepage = "http://flori.github.com/memosig"
   s.licenses = ["Apache-2.0"]
   s.rdoc_options = ["--title", "Memosig", "--main", "README.md"]
   s.rubygems_version = "2.4.5"
   s.summary = "Executable that supervises memory use of processes and signals them"
-  s.test_files = ["spec/memosig/app_spec.rb", "spec/memosig/proc_stat_spec.rb", "spec/spec_helper.rb"]
+  s.test_files = ["spec/memosig/app_spec.rb", "spec/memosig/matcher_spec.rb", "spec/memosig/output_spec.rb", "spec/memosig/proc_stat_spec.rb", "spec/spec_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<byebug>, [">= 0"])
       s.add_runtime_dependency(%q<tins>, ["~> 1.0"])
       s.add_runtime_dependency(%q<complex_config>, [">= 0"])
     else
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<tins>, ["~> 1.0"])
       s.add_dependency(%q<complex_config>, [">= 0"])
     end
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<tins>, ["~> 1.0"])
     s.add_dependency(%q<complex_config>, [">= 0"])
   end

data/spec/memosig/app_spec.rb

@@ -9,13 +9,85 @@ RSpec.describe Memosig::App do
     Memosig::App.new(config: config)
   end
 
+  let :current_processes do
+    [ Memosig::ProcStat.new($$, 666, 'unicorn worker') ]
+  end
+
+  before do
+    allow(app).to receive(:sleep)
+    allow(app).to receive(:current_processes).and_return(current_processes)
+  end
+
   it 'loads config' do
     expect(app.config).to be_a ComplexConfig::Settings
   end
 
-  it 'checks the memory and sleeps if run' do
-    expect(app).to receive(:check_memory)
-    expect(app).to receive(:sleep)
-    app.run
+  it 'can gather process information' do
+    expect(
+      Memosig::App.new(config: config).instance_eval { current_processes }
+    ).not_to be_empty
+  end
+
+  context '#run' do
+    it 'checks the memory and sleeps' do
+      expect(app).to receive(:check_memory)
+      expect(app).to receive(:sleep)
+      app.run
+    end
+  end
+
+  context '#check_memory' do
+    it 'fetches all current processes' do
+      allow(app).to receive(:check_memory_for)
+      expect(app).to receive(:check_memory_for).with(
+        :'unicorn worker',
+        app.config.processes[:'unicorn worker'],
+        current_processes
+      )
+      expect(app).to receive(:output).with /checking memory limits/
+      app.instance_eval { check_memory }
+    end
+
+    it 'calls check_memory_for for each pattern and config' do
+      allow(app).to receive(:output)
+      expect(app).to receive(:check_memory_for).with(
+        :'unicorn worker',
+        app.config.processes[:'unicorn worker'],
+        current_processes
+      )
+      expect(app).to receive(:check_memory_for).with(
+        :'\Asidekiq ',
+        app.config.processes[:'\Asidekiq '],
+        current_processes
+      )
+      app.instance_eval { check_memory }
+    end
+  end
+
+  context '#check_memory_for' do
+    after do
+      app.instance_eval do
+        check_memory_for(
+          :'unicorn worker',
+          config.processes[:'unicorn worker'],
+          current_processes
+        )
+      end
+    end
+
+    it 'can match' do
+      expect_any_instance_of(Memosig::Matcher).to receive(:match?).with(
+        current_processes.first
+      ).and_return true
+    end
+
+    it 'cannot match' do
+      expect_any_instance_of(Memosig::Matcher).to receive(:match?).with(
+        current_processes.first
+      ).and_return false
+      expect(app).to receive(:error).with(
+        /pattern "unicorn worker" didn't match any processes/
+      )
+    end
   end
 end

data/spec/memosig/matcher_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'timeout'
+
+RSpec.describe Memosig::Matcher do
+  let :config do
+    ComplexConfig::Settings[
+      rss_max: 666,
+      signal:  14,
+    ]
+  end
+
+  let :matcher do
+    Memosig::Matcher.new('command\z', config)
+  end
+
+  context '#match?' do
+    it 'does nothing if command does not match pattern' do
+      process = Memosig::ProcStat.new($$, 4242, 'not what we are looking for')
+      expect(matcher).not_to receive(:take_action)
+      expect(matcher).not_to receive(:lay_low)
+      expect(matcher).not_to be_match process
+    end
+
+    it 'takes action if rss > configured rss_max' do
+      process = Memosig::ProcStat.new($$, 4242, 'our cool command')
+      expect(matcher).to receive(:take_action)
+      expect(matcher).not_to receive(:lay_low)
+      expect(matcher).to be_match process
+    end
+
+    it 'lays low if rss <= configured rss_max' do
+      process = Memosig::ProcStat.new($$, 23, 'our cool command')
+      expect(matcher).not_to receive(:take_action)
+      expect(matcher).to receive(:lay_low)
+      expect(matcher).to be_match process
+    end
+  end
+
+  context '#take_action' do
+    it 'signals process if take action is called' do
+      process = Memosig::ProcStat.new($$, 4242, 'our cool command')
+      expect(matcher).to receive(:take_action).and_call_original
+      expect(matcher).to receive(:output).with /sending signal 14 to process/
+      alrm = false
+      trap(:ALRM) { alrm = true }
+      expect(matcher).to be_match process
+      Timeout.timeout(1) { sleep 0.1 until alrm } rescue Timeout::Error
+      expect(alrm).to eq true
+    end
+  end
+
+  context '#lay_low' do
+    it 'outputs a message if laying low' do
+      process = Memosig::ProcStat.new($$, 23, 'our cool command')
+      expect(matcher).to receive(:lay_low).and_call_original
+      expect(matcher).to receive(:output).with /no action on process/
+      expect(matcher).to be_match process
+    end
+  end
+end

data/spec/memosig/output_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+RSpec.describe Memosig::Output do
+  let :object do
+    Object.new.tap do |o|
+      o.extend(Memosig::Output)
+    end
+  end
+
+  it 'can generate the process_prefix' do
+    expect(object.process_prefix).to match /\w+ pid=\d+/
+  end
+
+  it 'can output messages with prefix' do
+    expect(STDOUT).to receive(:puts).with /\w+ pid=\d+.*foo/
+    object.output 'foo'
+  end
+
+  it 'can output error messages with prefix' do
+    expect(STDERR).to receive(:puts).with /\w+ pid=\d+.*foo/
+    object.error 'foo'
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,10 @@ if ENV['START_SIMPLECOV'].to_i == 1
 end
 
 require 'rspec'
+begin
+  require 'byebug'
+rescue LoadError
+end
 require 'memosig'
 
 def config_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memosig
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Florian Frank
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +124,7 @@ extra_rdoc_files:
 - lib/memosig/version.rb
 files:
 - ".gitignore"
+- ".rspec"
 - COPYING
 - Gemfile
 - README.md
@@ -125,6 +140,8 @@ files:
 - memosig.gemspec
 - spec/assets/memosig.yml
 - spec/memosig/app_spec.rb
+- spec/memosig/matcher_spec.rb
+- spec/memosig/output_spec.rb
 - spec/memosig/proc_stat_spec.rb
 - spec/spec_helper.rb
 homepage: http://flori.github.com/memosig
@@ -157,5 +174,7 @@ specification_version: 4
 summary: Executable that supervises memory use of processes and signals them
 test_files:
 - spec/memosig/app_spec.rb
+- spec/memosig/matcher_spec.rb
+- spec/memosig/output_spec.rb
 - spec/memosig/proc_stat_spec.rb
 - spec/spec_helper.rb