flapjack 1.2.1 → 1.2.2

data/lib/flapjack/gateways/sms_twilio.rb

@@ -4,6 +4,8 @@ require 'em-synchrony'
 require 'em-synchrony/em-http'
 require 'active_support/inflector'
 
+require 'flapjack/redis_pool'
+
 require 'flapjack/data/alert'
 require 'flapjack/utility'
 
@@ -17,98 +19,124 @@ module Flapjack
       # --data-urlencode 'Body=Sausage' \
       # -u [AccountSid]:[AuthToken]
 
-      class << self
+      include Flapjack::Utility
 
-        include Flapjack::Utility
+      def initialize(opts = {})
+        @config = opts[:config]
+        @logger = opts[:logger]
+        @redis_config = opts[:redis_config] || {}
+        @redis = Flapjack::RedisPool.new(:config => @redis_config, :size => 1, :logger => @logger)
 
-        def start
-          @sent = 0
-        end
+        @logger.info("starting")
+        @logger.debug("new sms_twilio gateway pikelet with the following options: #{@config.inspect}")
 
-        def perform(contents)
-          @logger.debug "Woo, got a notification to send out: #{contents.inspect}"
-          alert = Flapjack::Data::Alert.new(contents, :logger => @logger)
-
-          account_sid = @config["account_sid"]
-          auth_token  = @config["auth_token"]
-          from        = @config["from"]
-          endpoint    = @config["endpoint"] || "https://api.twilio.com/2010-04-01/Accounts/#{account_sid}/Messages.json"
-
-          address         = alert.address
-          notification_id = alert.notification_id
-          message_type    = alert.rollup ? 'rollup' : 'alert'
-
-          my_dir = File.dirname(__FILE__)
-          sms_template_path = case
-          when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
-            @config['templates']["#{message_type}.text"]
-          else
-            my_dir + "/sms_twilio/#{message_type}.text.erb"
-          end
-          sms_template = ERB.new(File.read(sms_template_path), nil, '-')
+        @sent = 0
+      end
+
+      def stop
+        @logger.info("stopping")
+        @should_quit = true
+
+        redis_uri = @redis_config[:path] ||
+          "redis://#{@redis_config[:host] || '127.0.0.1'}:#{@redis_config[:port] || '6379'}/#{@redis_config[:db] || '0'}"
+        shutdown_redis = EM::Hiredis.connect(redis_uri)
+        shutdown_redis.rpush(@config['queue'], Flapjack.dump_json('notification_type' => 'shutdown'))
+      end
 
-          @alert  = alert
-          bnd     = binding
+      def start
+        queue = @config['queue']
 
+        until @should_quit
           begin
-            message = sms_template.result(bnd).chomp
+            @logger.debug("sms_twilio gateway is going into blpop mode on #{queue}")
+            deliver( Flapjack::Data::Alert.next(queue, :redis => @redis, :logger => @logger) )
           rescue => e
-            @logger.error "Error while excuting the ERB for an sms: " +
-              "ERB being executed: #{sms_template_path}"
-            raise
+            @logger.error "Error generating or dispatching SMS Twilio message: #{e.class}: #{e.message}\n" +
+              e.backtrace.join("\n")
           end
+        end
+      end
 
-          if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
-            @logger.error "sms_twilio config is missing"
-            return
-          end
+      def deliver(alert)
+        account_sid = @config["account_sid"]
+        auth_token  = @config["auth_token"]
+        from        = @config["from"]
+        endpoint    = @config["endpoint"] || "https://api.twilio.com/2010-04-01/Accounts/#{account_sid}/Messages.json"
+
+        address         = alert.address
+        notification_id = alert.notification_id
+        message_type    = alert.rollup ? 'rollup' : 'alert'
+
+        my_dir = File.dirname(__FILE__)
+        sms_template_path = case
+        when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+          @config['templates']["#{message_type}.text"]
+        else
+          my_dir + "/sms_twilio/#{message_type}.text.erb"
+        end
+        sms_template = ERB.new(File.read(sms_template_path), nil, '-')
 
-          errors = []
+        @alert  = alert
+        bnd     = binding
 
-          safe_message = truncate(message, 159)
+        begin
+          message = sms_template.result(bnd).chomp
+        rescue => e
+          @logger.error "Error while excuting the ERB for an sms: " +
+            "ERB being executed: #{sms_template_path}"
+          raise
+        end
 
-          [[account_sid, "Twilio account_sid is missing"],
-           [auth_token, "Twilio auth_token is missing"],
-           [from,  "SMS from address is missing"],
-           [address,  "SMS address is missing"],
-           [notification_id, "Notification id is missing"]].each do |val_err|
+        if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
+          @logger.error "sms_twilio config is missing"
+          return
+        end
 
-            next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
-            errors << val_err.last
-          end
+        errors = []
 
-          unless errors.empty?
-            errors.each {|err| @logger.error err }
-            return
-          end
+        safe_message = truncate(message, 159)
 
-          body_data = {'To'   => address,
-                   'From' => from,
-                   'Body' => safe_message}
-          @logger.debug "body_data: #{body_data.inspect}"
-          @logger.debug "authorization: [#{account_sid}, #{auth_token[0..2]}...#{auth_token[-3..-1]}]"
-
-          http = EM::HttpRequest.new(endpoint).post(:body => body_data, :head => {'authorization' => [account_sid, auth_token]})
-
-          @logger.debug "server response: #{http.response}"
-
-          status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
-          if (status >= 200) && (status <= 206)
-            @sent += 1
-            alert.record_send_success!
-            @logger.debug "Sent SMS via Twilio, response status is #{status}, " +
-              "notification_id: #{notification_id}"
-          else
-            @logger.error "Failed to send SMS via Twilio, response status is #{status}, " +
-              "notification_id: #{notification_id}"
-          end
-        rescue => e
-          @logger.error "Error generating or delivering sms to #{contents['address']}: #{e.class}: #{e.message}"
-          @logger.error e.backtrace.join("\n")
-          raise
+        [[account_sid, "Twilio account_sid is missing"],
+         [auth_token, "Twilio auth_token is missing"],
+         [from,  "SMS from address is missing"],
+         [address,  "SMS address is missing"],
+         [notification_id, "Notification id is missing"]].each do |val_err|
+
+          next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
+          errors << val_err.last
+        end
+
+        unless errors.empty?
+          errors.each {|err| @logger.error err }
+          return
         end
 
+        body_data = {'To'   => address,
+                 'From' => from,
+                 'Body' => safe_message}
+        @logger.debug "body_data: #{body_data.inspect}"
+        @logger.debug "authorization: [#{account_sid}, #{auth_token[0..2]}...#{auth_token[-3..-1]}]"
+
+        http = EM::HttpRequest.new(endpoint).post(:body => body_data, :head => {'authorization' => [account_sid, auth_token]})
+
+        @logger.debug "server response: #{http.response}"
+
+        status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
+        if (status >= 200) && (status <= 206)
+          @sent += 1
+          alert.record_send_success!
+          @logger.debug "Sent SMS via Twilio, response status is #{status}, " +
+            "notification_id: #{notification_id}"
+        else
+          @logger.error "Failed to send SMS via Twilio, response status is #{status}, " +
+            "notification_id: #{notification_id}"
+        end
+      rescue => e
+        @logger.error "Error generating or delivering sms to #{alert.address}: #{e.class}: #{e.message}"
+        @logger.error e.backtrace.join("\n")
+        raise
       end
+
     end
   end
 end

data/lib/flapjack/gateways/sms_twilio/alert.text.erb

@@ -1,5 +1,6 @@
+<% summary = @alert.summary -%>
 <%= @alert.type_sentence_case %>: '<%= @alert.check %>' on <%= @alert.entity -%>
 <% unless ['acknowledgement', 'test'].include?(@alert.notification_type) -%>
  is <%= @alert.state_title_case -%>
 <% end -%>
- at <%= Time.at(@alert.time).strftime('%-d %b %H:%M') %>, <%= @alert.summary -%>
+ at <%= Time.at(@alert.time).strftime('%-d %b %H:%M') %><%= (summary.nil? || summary.empty?) ? '' : ", #{summary}" -%>

data/lib/flapjack/logger.rb

@@ -25,7 +25,7 @@ module Flapjack
       @name = name
 
       @formatter = proc do |severity, datetime, progname, msg|
-        t = datetime.iso8601
+        t = datetime.iso8601(6)
         "#{t} [#{severity}] :: #{name} :: #{msg}\n"
       end
 

data/lib/flapjack/notifier.rb

@@ -4,6 +4,8 @@ require 'active_support/time'
 
 require 'em-hiredis'
 
+require 'flapjack/data/alert'
+
 require 'flapjack/data/contact'
 require 'flapjack/data/entity_check'
 require 'flapjack/data/notification'
@@ -14,6 +16,7 @@ require 'flapjack/utility'
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
 require 'flapjack/gateways/sms_twilio'
+require 'flapjack/gateways/sms_gammu'
 require 'flapjack/gateways/aws_sns'
 
 module Flapjack
@@ -127,7 +130,7 @@ module Flapjack
         @notifylog.info("#{event_id} | " +
           "#{notification.type} | #{message.contact.id} | #{media_type} | #{address}")
 
-        unless @queues[media_type.to_s]
+        if @queues[media_type.to_s].nil?
           @logger.error("no queue for media type: #{media_type}")
           return
         end
@@ -154,19 +157,7 @@ module Flapjack
         contents_tags = contents['tags']
         contents['tags'] = contents_tags.is_a?(Set) ? contents_tags.to_a : contents_tags
 
-        # FIXME(@auxesis): change Resque jobs to use raw blpop
-        case media_type.to_sym
-        when :sms
-          Resque.enqueue_to(@queues['sms'], Flapjack::Gateways::SmsMessagenet, contents)
-        when :sms_twilio
-          Resque.enqueue_to(@queues['sms_twilio'], Flapjack::Gateways::SmsTwilio, contents)
-        when :email
-          Resque.enqueue_to(@queues['email'], Flapjack::Gateways::Email, contents)
-        when :sns
-          Resque.enqueue_to(@queues['sns'], Flapjack::Gateways::AwsSns, contents)
-        else
-          @redis.rpush(@queues[media_type.to_s], Flapjack.dump_json(contents))
-        end
+        Flapjack::Data::Alert.add(@queues[media_type.to_s], contents, :redis => @redis)
       end
     end
 

data/lib/flapjack/patches.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'thin'
-require 'resque'
 require 'redis'
 
 # we don't want to stop the entire EM reactor when we stop a web server
@@ -46,63 +45,6 @@ module Thin
   end
 end
 
-# Resque is really designed around a multiprocess model, so we here we
-# stub some that behaviour away.
-module Resque
-
-  class Worker
-
-    def procline(string)
-      # $0 = "resque-#{Resque::Version}: #{string}"
-      # log! $0
-    end
-
-    # Redefining the entire method to stop the direct access to $0 :(
-    def work(interval = 5.0, &block)
-      interval = Float(interval)
-      # $0 = "resque: Starting"
-      startup
-
-      loop do
-
-        break if shutdown?
-
-        if not paused? and job = reserve
-          log "got: #{job.inspect}"
-          job.worker = self
-          run_hook :before_fork, job
-          working_on job
-
-          if @child = fork
-            srand # Reseeding
-            procline "Forked #{@child} at #{Time.now.to_i}"
-            Process.wait(@child)
-          else
-            unregister_signal_handlers if !@cant_fork && term_child
-            procline "Processing #{job.queue} since #{Time.now.to_i}"
-            redis.client.reconnect if !@cant_fork # Don't share connection with parent
-            perform(job, &block)
-            exit! unless @cant_fork
-          end
-
-          done_working
-          @child = nil
-        else
-          break if interval.zero?
-          log! "Sleeping for #{interval} seconds"
-          procline paused? ? "Paused" : "Waiting for #{@queues.join(',')}"
-          sleep interval
-        end
-      end
-
-      unregister_worker
-    rescue Exception => exception
-      unregister_worker(exception)
-    end
-
-  end
-end
-
 # As Redis::Future objects inherit from BasicObject, it's difficult to
 # distinguish between them and other objects in collected data from
 # pipelined queries.

data/lib/flapjack/pikelet.rb

@@ -13,8 +13,6 @@
 require 'hiredis'
 require 'redis/connection/synchrony'
 require 'redis'
-require 'em-resque'
-require 'em-resque/worker'
 require 'thin'
 
 require 'flapjack/notifier'
@@ -26,6 +24,7 @@ require 'flapjack/gateways/pagerduty'
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
 require 'flapjack/gateways/sms_twilio'
+require 'flapjack/gateways/sms_gammu'
 require 'flapjack/gateways/aws_sns'
 require 'flapjack/gateways/web'
 require 'flapjack/logger'
@@ -45,7 +44,7 @@ module Flapjack
 
     # TODO find a better way of expressing these two methods
     def self.is_pikelet?(type)
-      type_klass = [Flapjack::Pikelet::Generic, Flapjack::Pikelet::Resque,
+      type_klass = [Flapjack::Pikelet::Generic,
         Flapjack::Pikelet::Thin].detect do |kl|
 
         kl::PIKELET_TYPES[type]
@@ -57,7 +56,6 @@ module Flapjack
     def self.create(type, opts = {})
       pikelet = nil
       [Flapjack::Pikelet::Generic,
-       Flapjack::Pikelet::Resque,
        Flapjack::Pikelet::Thin].each do |kl|
         next unless kl::PIKELET_TYPES[type]
         break if pikelet = kl.create(type, opts)
@@ -95,14 +93,6 @@ module Flapjack
         @status = 'stopping'
       end
 
-      def configure_resque
-        unless ::Resque.instance_variable_defined?('@flapjack_pool') && !::Resque.instance_variable_get('@flapjack_pool').nil?
-          resque_pool = Flapjack::RedisPool.new(:config => @redis_config, :logger => @logger)
-          ::Resque.instance_variable_set('@flapjack_pool', resque_pool)
-          ::Resque.redis = resque_pool
-        end
-      end
-
     end
 
     class Generic < Flapjack::Pikelet::Base
@@ -111,7 +101,12 @@ module Flapjack
                       'processor'  => Flapjack::Processor,
                       'jabber'     => Flapjack::Gateways::Jabber,
                       'pagerduty'  => Flapjack::Gateways::Pagerduty,
-                      'oobetet'    => Flapjack::Gateways::Oobetet}
+                      'oobetet'    => Flapjack::Gateways::Oobetet,
+                      'email'      => Flapjack::Gateways::Email,
+                      'sms'        => Flapjack::Gateways::SmsMessagenet,
+                      'sms_gammu'  => Flapjack::Gateways::SmsGammu,
+                      'sms_twilio' => Flapjack::Gateways::SmsTwilio,
+                      'sns'        => Flapjack::Gateways::AwsSns}
 
       def self.create(type, opts = {})
         self.new(type, PIKELET_TYPES[type], :config => opts[:config],
@@ -123,8 +118,6 @@ module Flapjack
       def initialize(type, pikelet_klass, opts = {})
         super(type, pikelet_klass, opts)
 
-        configure_resque if type == 'notifier'
-
         @pikelet = @klass.new(opts.merge(:logger => @logger))
       end
 
@@ -155,69 +148,6 @@ module Flapjack
 
     end
 
-    class Resque < Flapjack::Pikelet::Base
-
-      PIKELET_TYPES = {'email'      => Flapjack::Gateways::Email,
-                       'sms'        => Flapjack::Gateways::SmsMessagenet,
-                       'sms_twilio' => Flapjack::Gateways::SmsTwilio,
-                       'sns'        => Flapjack::Gateways::AwsSns}
-
-      def self.create(type, opts = {})
-        self.new(type, PIKELET_TYPES[type], :config => opts[:config],
-          :redis_config => opts[:redis_config],
-          :boot_time => opts[:boot_time])
-      end
-
-      def initialize(type, pikelet_klass, opts = {})
-        super(type, pikelet_klass, opts)
-
-        configure_resque
-
-        # guard against another Resque pikelet having created the pool already
-        unless defined?(@@redis_connection) && !@@redis_connection.nil?
-          @@redis_connection = Flapjack::RedisPool.new(:config => @redis_config, :logger => @logger)
-        end
-
-        pikelet_klass.instance_variable_set('@config', @config)
-        pikelet_klass.instance_variable_set('@redis', @@redis_connection)
-        pikelet_klass.instance_variable_set('@logger', @logger)
-
-        # TODO error if config['queue'].nil?
-
-        @worker = EM::Resque::Worker.new(@config['queue'])
-        # # Use these to debug the resque workers
-        # worker.verbose = true
-        # worker.very_verbose = true
-      end
-
-      def start
-        @fiber = Fiber.new {
-          @worker.work(0.1)
-        }
-        super
-        @klass.start if @klass.respond_to?(:start)
-        @fiber.resume
-      end
-
-      # this should only reload if all changes can be applied -- will
-      # return false to log warning otherwise
-      def reload(cfg)
-        @klass.respond_to?(:reload) ?
-          (@klass.reload(cfg) && super(cfg)) : super(cfg)
-      end
-
-      def stop
-        @worker.shutdown if @worker && @fiber && @fiber.alive?
-        @klass.stop if @klass.respond_to?(:stop)
-        super
-      end
-
-      def update_status
-        return @status unless 'stopping'.eql?(@status)
-        @status = 'stopped' if @fiber && !@fiber.alive?
-      end
-    end
-
     class Thin < Flapjack::Pikelet::Base
 
       PIKELET_TYPES = {'web'     => Flapjack::Gateways::Web,