process_handler 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e47422baa38b9c91c4bbaff699373e903c6f01
-  data.tar.gz: 5378e9443a93f92a57cb83ea6c69197b6ec9ae6a
+  metadata.gz: 96dfb240ae4f597188a5ff12c95fa1f9d8478365
+  data.tar.gz: ebc125a0ca392c0ca7f7754650a5ae80290dfe2b
 SHA512:
-  metadata.gz: a9e25775c634f4bd5a41c3dde5ede86888c1222e396ad871f74f6999c5ef010cf1accd6a209c053658aa1dffe953325a04bb7aa6e17174fe87ba8ca1990f057b
-  data.tar.gz: 401159f363f22948e273b396a3795139cf5879a6e27d5225301a06876cd668c2fb638cef21eb660dc6990a30ef9366939e6b785ae05b7f9eb56f9df4c9072496
+  metadata.gz: 9c6aac593c894445137330a8d812dff1c03b81ccdae5254c1203659d30bf8aa2236ed844236b7859c1eb870517fe04f4f6d696a8c38ce706381ca47af69bc894
+  data.tar.gz: 9cdf6d9278e73b532dc853b52eb69f54ae1efbbf04f257fdc9e89a85503887b521cac5a2b4ce56ed6b32ffb5c2a8d6695aad5f5ed59e860cd2c92fa8d7684a64

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'rufus-scheduler'
+gem 'rufus-scheduler', '~> 3.2.1'
 gem 'logasm'
 
 group :test do

data/lib/salemove/process_handler/notifier_factory.rb

@@ -14,6 +14,11 @@ module Salemove
             airbrake.secure = true
             airbrake.host = conf.fetch(:host)
             airbrake.api_key = conf.fetch(:api_key)
+            [/_HOST$/, /_TCP$/, /_UDP$/, /_PROTO$/, /_ADDR$/, 'PWD',
+            'GEM_HOME', 'PATH', 'SERVICE_NAME', 'RUBY_MAJOR', 'RUBY_VERSION', 
+            'RUN_ENV', 'HOME', 'RUBYGEMS_VERSION', 'BUNDLER_VERSION'].each { 
+              | param_whitelist_filter| airbrake.params_whitelist_filters << param_whitelist_filter 
+            }
           end
           Airbrake
         elsif conf && conf[:type] == 'growl'

data/lib/salemove/process_handler/version.rb

@@ -1,5 +1,5 @@
 module Salemove
   module ProcessHandler
-    VERSION = '0.2.9'
+    VERSION = '0.3.0'
   end
 end

data/spec/process_handler/airbrake_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'airbrake'
+require 'airbrake/notice'
+require 'salemove/process_handler/notifier_factory'
+
+describe 'Airbrake configuration' do
+
+  let (:notice) { Airbrake::Notice.new(notice_args.merge(custom_notice_args)) }
+  let (:notifier_factory_conf) { {:type => 'airbrake',:host => 'localhost',:api_key => 'abc123'} }
+  let (:airbrake) { ProcessHandler::NotifierFactory.get_notifier('env', 'Process name', notifier_factory_conf) }
+  # Notice needs Airbrake configuration merged with :exception for creating the exception notification
+  let (:notice_args) { {:exception => Exception.new}.merge(airbrake.configuration) }
+  let (:filtered) { '[FILTERED]' }
+
+  # Uses Airbrake configuration's 'params_whitelist_filters' param for filtering
+  context 'whitelist filter' do
+
+    let (:custom_notice_args) {
+      {
+        :params_filters => [], # Remove blacklist to test whitelist
+        :parameters => {
+          'API_PORT_80_TCP_PROTO' => 'tcp',
+          'HOME' => '/home/sm',
+          'SECRET_PASS' => 'Parool123',
+          'SOME_PROTO_KEY' => 'value',
+          'PROTO_KEY' => 'abc123'
+        },
+        :cgi_data => {
+          'HTTP_HOST' => 'localhost:3001',
+          'RANDOM' => 'value',
+          'HOME' => 'sweet home'
+        }
+      }
+    }
+
+    it 'allows parameters by regex' do
+      expect(notice[:parameters]['API_PORT_80_TCP_PROTO']).to eq 'tcp'
+      expect(notice[:cgi_data]['HTTP_HOST']).to eq 'localhost:3001'
+    end
+
+    it 'allows parameters by string' do
+      expect(notice[:parameters]['HOME']).to eq '/home/sm'
+      expect(notice[:cgi_data]['HOME']).to eq 'sweet home'
+    end
+
+    it 'filters variables not in whitelist' do
+      expect(notice[:parameters]['SECRET_PASS']).to eq filtered
+      expect(notice[:parameters]['SOME_PROTO_KEY']).to eq filtered
+      expect(notice[:parameters]['PROTO_KEY']).to eq filtered
+      expect(notice[:cgi_data]['RANDOM']).to eq filtered
+    end
+
+  end
+
+end

data/spec/process_handler/cron_process_spec.rb

@@ -66,18 +66,23 @@ describe ProcessHandler::CronProcess do
     let(:notifier_factory) { double('NotifierFactory') }
     let(:exception_notifier) { double('Airbrake') }
     let(:queue) { Queue.new }
+    let(:scheduler_interval) {0.8}
 
     before(:each) do
       allow(notifier_factory).to receive(:get_notifier) { exception_notifier }
     end
 
     it 'notifies of exception' do
-      process.schedule('0.3')
+      process.schedule(scheduler_interval.to_s)
       expect(exception_notifier).to receive(:notify_or_ignore)
       Thread.new do
         process.spawn(ExceptionService.new(queue))
       end
+      # block main thread until ExceptionService is called at least once
       queue.pop
+      # sometimes main thread finishes before thrown exception has reached the notifier
+      # so we wait in the main thread a bit (but no longer than the scheduler interval)
+      sleep(scheduler_interval / 2)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_handler
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Indrek Juhkam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
@@ -92,6 +92,7 @@ files:
 - process_handler.gemspec
 - spec/fixtures/composite_service.rb
 - spec/fixtures/cron_service.rb
+- spec/process_handler/airbrake_spec.rb
 - spec/process_handler/composite_process_spec.rb
 - spec/process_handler/cron_process_spec.rb
 - spec/process_handler/pivot_process_spec.rb
@@ -116,13 +117,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
 - spec/fixtures/composite_service.rb
 - spec/fixtures/cron_service.rb
+- spec/process_handler/airbrake_spec.rb
 - spec/process_handler/composite_process_spec.rb
 - spec/process_handler/cron_process_spec.rb
 - spec/process_handler/pivot_process_spec.rb