bipbip 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767f7a2a56b1e00dc86b36f60d4599440ca5f226
-  data.tar.gz: 3619bb7f7c507ae3687df15d5e4231ac5a930070
+  metadata.gz: 27e9aa7d8a9f00d2940ec3dde1918556f32b5453
+  data.tar.gz: e73717090f198d321f70deab0dd4540d08addc33
 SHA512:
-  metadata.gz: 7700dd1f8f8de9a8e4e8a77b09f8e2e5281b745c22fcec18add44e12224acd9deec5c57b7272a0c50fa24dd17cf208a9f31f8f60170b8bc1c7683a0ee9166ec3
-  data.tar.gz: 5bec57fe7ba560975a231c647b50dfa15adc16c02b830dc127153d832300961d50060cc8aa8fb711b1e894db3b0af1e7d34b37ad394f0e45ca9dea14cdb5e4ac
+  metadata.gz: b47fdeb97354d69730a3a3cf72cd8bcaa32f05622031e4a152dec618228ebb2027ebb6da37c2182afe87b84f2ee27df1e3fa7f993ca297dc5ee531ce7a589f04
+  data.tar.gz: ebe253a1196b617650450c467d3e4ff4194c3c7bfdd6dc9579967895eab62549420ead96d308b9568dbe461e8e5806e1cc32ee9da67b5ef7c1ee52cc7a6235f9

data/lib/bipbip.rb

@@ -9,6 +9,7 @@ module Bipbip
   require 'shellwords'
 
   require 'interruptible_sleep'
+  require 'process_exists'
 
   require 'bipbip/version'
   require 'bipbip/helper'

data/lib/bipbip/agent.rb

@@ -2,22 +2,26 @@ module Bipbip
 
   class Agent
 
+    PLUGIN_RESPAWN_DELAY = 5
+
     attr_accessor :plugins
     attr_accessor :storages
 
     def initialize(config_file = nil)
       @plugins = []
       @storages = []
-      @plugin_pids = []
 
       load_config(config_file) if config_file
     end
 
     def run
       Bipbip.logger.info 'Startup...'
-      Bipbip.logger.warn 'No services configured' if @plugins.empty?
       Bipbip.logger.warn 'No storages configured' if @storages.empty?
 
+      if @plugins.empty?
+        raise 'No services configured'
+      end
+
       @storages.each do |storage|
         @plugins.each do |plugin|
           Bipbip.logger.info "Setting up plugin #{plugin.name} for storage #{storage.name}"
@@ -26,16 +30,24 @@ module Bipbip
       end
 
       ['INT', 'TERM'].each { |sig| trap(sig) {
-        Thread.new { interrupt }
+        Thread.new do
+          interrupt
+          exit
+        end
       } }
 
       @plugins.each do |plugin|
         Bipbip.logger.info "Starting plugin #{plugin.name} with config #{plugin.config}"
-        @plugin_pids.push plugin.run(@storages)
+        plugin.run(@storages)
       end
 
-      while true
-        sleep 1
+      @interrupted = false
+      until @interrupted
+        pid = Process.wait(-1)
+        plugin = plugin_by_pid(pid)
+        Bipbip.logger.error "Plugin #{plugin.name} with config #{plugin.config} died. Respawning..."
+        sleep(PLUGIN_RESPAWN_DELAY)
+        plugin.run(@storages)
       end
     end
 
@@ -78,14 +90,25 @@ module Bipbip
     end
 
     def interrupt
+      @interrupted = true
+
       Bipbip.logger.info 'Interrupt, killing plugin processes...'
-      @plugin_pids.each { |pid| Process.kill('TERM', pid) }
+      @plugins.each do |plugin|
+        Process.kill('TERM', plugin.pid) if Process.exists?(plugin.pid)
+      end
 
       Bipbip.logger.info 'Waiting for all plugin processes to exit...'
       Process.waitall
+    end
 
-      Bipbip.logger.info 'Exiting'
-      exit
+    private
+
+    def plugin_by_pid(pid)
+      plugin = @plugins.find { |plugin| plugin.pid == pid }
+      if plugin.nil?
+        raise "Cannot find plugin with pid #{pid}"
+      end
+      plugin
     end
   end
 end

data/lib/bipbip/plugin.rb

@@ -6,6 +6,7 @@ module Bipbip
     attr_accessor :name
     attr_accessor :config
     attr_accessor :metric_group
+    attr_accessor :pid
 
     def self.factory(name, config, frequency, metric_group = nil)
       require "bipbip/plugin/#{Bipbip::Helper.name_to_filename(name)}"
@@ -15,12 +16,12 @@ module Bipbip
     def initialize(name, config, frequency, metric_group = nil)
       @name = name.to_s
       @config = config.to_hash
-      @frequency = frequency.to_i
+      @frequency = frequency.to_f
       @metric_group = (metric_group || name).to_s
     end
 
     def run(storages)
-      child_pid = fork do
+      @pid = fork do
         ['INT', 'TERM'].each { |sig| trap(sig) {
           Thread.new { interrupt } if !@interrupted
         } }
@@ -41,10 +42,13 @@ module Bipbip
             interruptible_sleep (frequency - (Time.now - time))
           end
         rescue => e
-          Bipbip.logger.error "#{name} #{source_identifier}: Error getting data: #{e.message}"
+          Bipbip.logger.error "#{name} #{source_identifier}: Error: #{e.message}"
           interruptible_sleep retry_delay
           retry_delay += frequency if retry_delay < frequency * 10
           retry
+        rescue Exception => e
+          Bipbip.logger.error "#{name} #{source_identifier}: Fatal error: #{e.message}"
+          raise e
         end
       end
     end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -138,6 +138,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: process_exists
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Gather services data and store in CopperEgg