pulse-meter-rails 0.0.1 → 0.1.0

data/lib/pulse-meter-rails.rb

@@ -28,11 +28,39 @@ module PulseToolbox
     end
   end
 
-  def self.redis=(redis)
-    PulseMeter.redis = redis
-  end
+  class << self
+    @@pid = nil
+    @@redis_config = {}
+
+    def redis=(redis)
+      PulseMeter.redis = redis
+      @@pid = Process.pid
+      @@redis_config = {
+        :host => redis.client.host,
+        :port => redis.client.port,
+        :db => redis.client.db
+      }
+    end
+
+    def redis
+      reconnect if pid_changed
+      PulseMeter.redis
+    end
 
-  def self.redis
-    PulseMeter.redis
+    def reconnect
+      PulseMeter.redis = Redis.new(
+        :host => @@redis_config[:host],
+        :port => @@redis_config[:port],
+        :db => @@redis_config[:db]
+      )
+    end
+
+    def maybe_reconnect
+      reconnect if pid_changed
+    end
+
+    def pid_changed
+      @@pid && @@pid != Process.pid
+    end
   end
 end

data/lib/pulse_toolbox/sensor/initializer.rb

@@ -7,7 +7,6 @@ module PulseToolbox
     class Initializer < ::Rails::Railtie
       initializer "register_request_sensors", :after => :load_config_initializers do
         if PulseToolbox.redis
-          PulseToolbox::Sensor::Manager.create_sensors
           ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, start, finish, id, payload|
             total_time = (finish - start) * 1000
             view_time = payload[:view_runtime]

data/lib/pulse_toolbox/sensor/manager.rb

@@ -94,6 +94,7 @@ module PulseToolbox
 
       # Creates all sensors from sensors_config
       def self.create_sensors
+        PulseToolbox.maybe_reconnect
         config = cfg
         self.configurator = PulseMeter::Sensor::Configuration.new(cfg)
         each_sensor do |s|
@@ -121,7 +122,7 @@ module PulseToolbox
         # @param sensor [Symbol] sensor name
         # @param value [Float] event value
         def event(sensor, value)
-          configurator.sensor(sensor).event(value.to_i)
+          lazy_configurator.sensor(sensor).event(value.to_i)
         end
 
         # Adds group to config
@@ -172,7 +173,12 @@ module PulseToolbox
         end
 
         def get_sensor(group, name)
-          configurator.sensor(name_in_group(group, name))
+          lazy_configurator.sensor(name_in_group(group, name))
+        end
+
+        def lazy_configurator
+          create_sensors unless configurator
+          configurator
         end
 
       end

data/lib/pulse_toolbox/version.rb

@@ -1,3 +1,3 @@
 module PulseToolbox
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/pulse_meter_rails_spec.rb

@@ -1,19 +1,61 @@
 require 'spec_helper'
 
 describe PulseToolbox do
-  let(:redis) {"redis"}
+  let(:redis) {Redis.new}
 
   describe ".redis=" do
-    it "should set PulseMeter redis" do
+    it "sets PulseMeter redis" do
       described_class.redis = redis
       PulseMeter.redis.should == redis
     end
   end
 
   describe ".redis" do
-    it "should retrieve redis" do
+    before do
       described_class.redis = redis
+    end
+
+    it "retrieves redis" do
       described_class.redis.should == redis
     end
+
+    it "reconnects redis client when pid changes" do
+      old_object_id = described_class.redis.object_id
+      Process.stub(:pid).and_return(1)
+      described_class.redis.object_id.should_not == old_object_id
+    end
+  end
+
+  describe ".pid_changed" do
+    context "when pid is unchanged" do
+      it "returns false" do
+        described_class.pid_changed.should be_false
+      end
+    end
+
+    context "when pid changes" do
+      before do
+        described_class.redis = redis
+        Process.stub(:pid).and_return(1)
+      end
+
+      it "returns true" do
+        described_class.pid_changed.should be_true
+      end
+    end
+  end
+
+  describe ".reconnect" do
+    before do
+      described_class.redis = Redis.new :db => 2
+    end
+
+    it "recreates redis client" do
+      expect {described_class.reconnect}.to change {described_class.redis.object_id}
+    end
+
+    it "recreates redis client with same connection options" do
+      expect {described_class.reconnect}.not_to change {described_class.redis.client.id}
+    end
   end
 end

data/spec/support/helpers.rb

@@ -27,7 +27,7 @@ module Helpers
   end
 
   def and_run_generator(name)
-    system("cd " + RAILS_APP_PATH + " && rails g #{name}  > /dev/null 2>&1").should be_true
+    system("cd " + RAILS_APP_PATH + " && rails g #{name} > /dev/null 2>&1").should be_true
   end
 
   def i_should_see_route(route)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000Z
+date: 2012-06-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pulse-meter
-  requirement: &70271865769100 !ruby/object:Gem::Requirement
+  requirement: &70310319442960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271865769100
+  version_requirements: *70310319442960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70271865767600 !ruby/object:Gem::Requirement
+  requirement: &70310319442180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271865767600
+  version_requirements: *70310319442180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70271865766700 !ruby/object:Gem::Requirement
+  requirement: &70310319441220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271865766700
+  version_requirements: *70310319441220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70271865765740 !ruby/object:Gem::Requirement
+  requirement: &70310319440520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865765740
+  version_requirements: *70310319440520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70271865764820 !ruby/object:Gem::Requirement
+  requirement: &70310319439560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865764820
+  version_requirements: *70310319439560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70271865764200 !ruby/object:Gem::Requirement
+  requirement: &70310319438540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865764200
+  version_requirements: *70310319438540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271865763240 !ruby/object:Gem::Requirement
+  requirement: &70310319437940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865763240
+  version_requirements: *70310319437940
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70271865762540 !ruby/object:Gem::Requirement
+  requirement: &70310319437020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865762540
+  version_requirements: *70310319437020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271865761820 !ruby/object:Gem::Requirement
+  requirement: &70310319436520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865761820
+  version_requirements: *70310319436520
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70271865760920 !ruby/object:Gem::Requirement
+  requirement: &70310319435580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865760920
+  version_requirements: *70310319435580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70271865760060 !ruby/object:Gem::Requirement
+  requirement: &70310319434660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865760060
+  version_requirements: *70310319434660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70271865758880 !ruby/object:Gem::Requirement
+  requirement: &70310319433960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271865758880
+  version_requirements: *70310319433960
 description: Pulse meter toolbox
 email:
 - averyanov@gmail.com
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4152249781938887414
+      hash: 422521729533414755
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4152249781938887414
+      hash: 422521729533414755
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10