flapjack 0.6.50 → 0.6.51

data/Guardfile

@@ -7,7 +7,7 @@ end
 
 # NB: seems to be buggy with the default --progress formatter, was
 # causing failures to parse the features
-guard 'cucumber', :cli => '--no-profile --color --format fuubar --strict' do
+guard 'cucumber', :cli => '--no-profile --color --format Cucumber::Formatter::Fuubar --strict' do
   watch(%r{^features/.+\.feature$})
   watch(%r{^features/support/.+$})          { 'features' }
   watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }

data/flapjack.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'redis'
   gem.add_dependency 'em-resque'
   gem.add_dependency 'sinatra'
-  gem.add_dependency 'async-rack'
   gem.add_dependency 'rack-fiber_pool'
   gem.add_dependency 'haml'
   gem.add_dependency 'thin'

data/lib/flapjack/gateways/api.rb

@@ -8,7 +8,6 @@
 
 require 'time'
 
-require 'async-rack'
 require 'rack/fiber_pool'
 require 'sinatra/base'
 
@@ -83,8 +82,8 @@ module Flapjack
           @redis = Flapjack::RedisPool.new(:config => opts[:redis_config], :size => 1)
 
           if config && config['access_log']
-            access_logger = Flapjack::RackLogger.new(config['access_log'])
-            use Rack::CommonLogger, access_logger
+            access_logger = Flapjack::AsyncLogger.new(config['access_log'])
+            use Flapjack::CommonLogger, access_logger
           end
         end
 

data/lib/flapjack/gateways/pagerduty.rb

@@ -169,7 +169,7 @@ module Flapjack
           end
 
           # FIXME: try each set of credentials until one works (may have stale contacts turning up)
-          options = pagerduty_credentials.first.merge('check' => check)
+          options = pagerduty_credentials.first.merge('check' => "#{entity_check.entity_name}:#{check}")
 
           acknowledged = pagerduty_acknowledged?(options)
           if acknowledged.nil?
@@ -178,7 +178,7 @@ module Flapjack
           end
 
           pg_acknowledged_by = acknowledged[:pg_acknowledged_by]
-          @logger.debug "#{check} is acknowledged in pagerduty, creating flapjack acknowledgement... "
+          @logger.debug "#{entity_check.entity_name}:#{check} is acknowledged in pagerduty, creating flapjack acknowledgement... "
           who_text = ""
           if !pg_acknowledged_by.nil? && !pg_acknowledged_by['name'].nil?
             who_text = " by #{pg_acknowledged_by['name']}"

data/lib/flapjack/gateways/web.rb

@@ -6,7 +6,6 @@ require 'sinatra/base'
 require 'haml'
 require 'rack/fiber_pool'
 
-require 'async-rack'
 require 'flapjack/rack_logger'
 
 require 'flapjack/data/contact'
@@ -59,9 +58,10 @@ module Flapjack
           @redis = Flapjack::RedisPool.new(:config => opts[:redis_config], :size => 1)
 
           if config && config['access_log']
-            access_logger = Flapjack::RackLogger.new(config['access_log'])
-            use Rack::CommonLogger, access_logger
+            access_logger = Flapjack::AsyncLogger.new(config['access_log'])
+            use Flapjack::CommonLogger, access_logger
           end
+
         end
 
         def cleanup
@@ -91,6 +91,7 @@ module Flapjack
           parts  = r.split(':')[0..1]
           [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
         }.compact.sort_by {|parts| parts }
+
         haml :index
       end
 

data/lib/flapjack/rack_logger.rb

@@ -1,8 +1,47 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  class RackLogger < ::Logger
-    # Works around a 1.8-specific call to a Logger method in Rack::CommonLogger
-    def write(msg); self.send(:"<<", msg); end
+
+  class CommonLogger < Rack::CommonLogger
+
+    alias_method :orig_log, :log
+
+    private
+
+    def log(env, status, header, began_at)
+      ret = orig_log(env, status, header, began_at)
+      @logger.flush if @logger.is_a?(Flapjack::AsyncLogger)
+      ret
+    end
+
   end
-end
+
+  # from http://stackoverflow.com/questions/6427033/how-do-i-log-asynchronous-thinsinatrarack-requests
+ class AsyncLogger < ::Logger
+
+    attr_accessor :messages
+
+    def initialize(logdev, shift_age = 0, shift_size = 1048576)
+      @messages = {}
+      super(logdev, shift_age, shift_size)
+    end
+
+    def write(message)
+      stack << message
+    end
+
+    def stack
+      # This is the important async awareness
+      # It stores messages for each fiber separately
+      @messages[Fiber.current.object_id] ||= []
+    end
+
+    def flush
+      stack.each do |msg|
+        self.send(:"<<", msg)
+      end
+      @messages.delete(Fiber.current.object_id)
+    end
+  end
+
+end

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.50"
+  VERSION = "0.6.51"
 end

data/spec/lib/flapjack/gateways/pagerduty_spec.rb

@@ -101,6 +101,7 @@ describe Flapjack::Gateways::Pagerduty, :redis => true do
       'username'    => 'flapjack',
       'password'    => 'password123'
     }])
+    entity_check.should_receive(:entity_name).exactly(2).times.and_return('foo-app-01.bar.net:PING')
     entity_check.should_receive(:create_acknowledgement).with('summary' => 'Acknowledged on PagerDuty')
 
     Flapjack::Data::Global.should_receive(:unacknowledged_failing_checks).and_return([entity_check])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.50
+  version: 0.6.51
   prerelease: 
 platform: ruby
 authors:
@@ -173,22 +173,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: async-rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
@@ -481,18 +465,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2264351146423610852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2264351146423610852
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23