redis_alerting 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9002db58d2b36ba06bb23317c3bf5da1fe8a7699
-  data.tar.gz: 43fecfbb4fa2a032d0aa384b085504fa0c5c19a9
+  metadata.gz: 1a362dc26fffaa5486de92d039dc8faedd7053c6
+  data.tar.gz: 1a81505cad316a2c186836bcecc1858d4d8c18ea
 SHA512:
-  metadata.gz: 0693caadb5119b3cb42855c85d82a95155645455d3568f0641d80ee33c16bbe50e13f17522adf6cf9d5a03acfc839417d68724c4b9138d17c1b8369aeffe59f0
-  data.tar.gz: 95509af5f6264bb945082dc2dae47495b487d2159cf07bf6aa1c65473e0c6ad300b170319d17b5c48498987e7aefb725a34551f2ae91e8e01efbae91d26b1d28
+  metadata.gz: 165adae5b617fc8d6521590bd3d73067755eeb61eac0b314cd6e192937bb608ba25704ef0ee981f5e64b5f68c4dbd5c34cac5d3e44eece4969caa7e24049618b
+  data.tar.gz: 3de8b783b0ed529bd749ba3e111e26d2a13d11620738f426010deefe19a89246e71b101a6005adfbb96b509aca940187d4a799fdb232d790f7ec282d271251d1

data/README.md

@@ -57,6 +57,7 @@ Given the config file below we will describe how the gem would check some limits
 :namespace: alerts                     # the namespace to use for tracking active alerts/conditions
 :separator: .                          # redis namespace separator
 :channel: alerts                       # publish alert messages to this channel
+:faye_url: http://localhost/faye       # the URL of the Faye endpoint to publish to
 :extrema:                              # details for where to find extrema information
   :min: min                            # what you call your minimum
   :max: max                            # what you call your maximum
@@ -133,6 +134,21 @@ When an alert is no longer active, this message will be published:
 }
 ```
 
+#### Publishing to Faye
+
+There is also support for publishing to a [Faye](http://faye.jcoglan.com/) URL.  Simply put the Faye URL in your config file like so:
+
+```yaml
+:faye_url: http://localhost/faye
+:channel: alerts
+```
+
+Or set it at command line:
+
+    $ redis-alerting run -- -c config.yml --faye-url http://localhost/faye
+
+This will disable publishing to redis.  The channel will automatically be set to `/alerts` if you leave out the leading slash.
+
 ### Simple example
 
 With the engine started try this (still sticking with the keys in the config file above):

data/bin/redis-alerting

@@ -30,6 +30,7 @@ Daemons.run_proc("redis_alerting", daemon_opts ) do
     on :c, :config=, 'Configuration File'
     on :p, :pwd=, "Working directory"
     on :l, :log=, "Log at the specified level to stdout"
+    on :"faye-url=", "The Faye URL to publish to"
   end
 
   begin

data/etc/config.yml

@@ -3,6 +3,7 @@
 :namespace: alerts
 :separator: .
 :channel: alerts
+:faye_url: http://localhost/faye
 :extrema:
   :min: min
   :max: max

data/lib/redis_alerting/config.rb

@@ -19,6 +19,8 @@ module RedisAlerting
         @config[:config] = File.expand_path(@config[:config], @config[:pwd])
       end
 
+      @config[:faye_url] = @config[:"faye-url"] || @config[:faye_url]
+
       raise ArgumentError, "Invalid config file: #{@config[:config]}" unless File.exists? @config[:config]
       
       yaml = YAML.load_file(@config[:config])

data/lib/redis_alerting/engine.rb

@@ -1,7 +1,8 @@
 module RedisAlerting
   class Engine
-    def initialize(config, redis, log)
+    def initialize(config, redis, log, publisher)
       @config     = config
+      @publisher  = publisher
       @active_set = "#{@config[:namespace]}#{@config[:separator]}active"
       @redis      = redis
       @log        = log
@@ -95,7 +96,7 @@ module RedisAlerting
     end
 
     def publish(message)
-      @redis.publish @config[:channel], message.to_json
+      @publisher.publish @config[:channel], message
       @log.info "Pushed message: #{message.inspect}"
     end
 

data/lib/redis_alerting/faye_publisher.rb

@@ -0,0 +1,19 @@
+require 'faye'
+require 'faye/redis'
+require 'eventmachine'
+
+module RedisAlerting
+  class FayePublisher
+
+    def initialize(url)
+      Thread.new { EventMachine.run } unless EventMachine.reactor_running? && EventMachine.reactor_thread.alive?
+      @client = Faye::Client.new(url)
+    end
+
+    def publish(channel, message)
+      channel = "/#{channel}" unless channel.start_with?("/")
+      @client.publish(channel, message)
+    end
+
+  end
+end

data/lib/redis_alerting/redis_publisher.rb

@@ -0,0 +1,14 @@
+
+module RedisAlerting
+  class RedisPublisher
+
+    def initialize(redis)
+      @client = redis
+    end
+
+    def publish(channel, message)
+      @client.publish(channel, message.to_json)
+    end
+
+  end
+end

data/lib/redis_alerting/version.rb

@@ -1,3 +1,3 @@
 module RedisAlerting
-  VERSION = "1.3.2"
+  VERSION = "1.4.1"
 end

data/lib/redis_alerting.rb

@@ -1,6 +1,7 @@
 require "redis_alerting/version"
 require "redis_alerting/engine"
 require "redis_alerting/config"
+require "redis_alerting/faye_publisher"
 require 'redis'
 require 'logger'
 require 'yaml'
@@ -9,14 +10,23 @@ require 'json'
 module RedisAlerting
   class << self
     def run(opts)
-      config    = RedisAlerting::Config.new(opts).to_hash
+      @config    = RedisAlerting::Config.new(opts).to_hash
       log       = Logger.new STDOUT
-      log.level = config[:log_level]
-      engine    = RedisAlerting::Engine.new(config, ::Redis.new, log)
+      log.level = @config[:log_level]
+      @redis     = ::Redis.new
+      engine    = RedisAlerting::Engine.new(@config, @redis, log, publisher)
 
       loop do
         engine.run
-        sleep config[:interval]
+        sleep @config[:interval]
+      end
+    end
+    
+    def publisher
+      if @config[:faye_url]
+        return RedisAlerting::FayePublisher.new(@config[:faye_url])
+      else
+        return RedisAlerting::RedisPublisher.new(@redis)
       end
     end
   end

data/redis_alerting.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "redis"
-  spec.add_dependency "slop"
+  spec.add_dependency "slop", '~> 3.6.0'
   spec.add_dependency "daemons"
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_alerting
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Robert McLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -28,16 +28,16 @@ dependencies:
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +127,8 @@ files:
 - lib/redis_alerting.rb
 - lib/redis_alerting/config.rb
 - lib/redis_alerting/engine.rb
+- lib/redis_alerting/faye_publisher.rb
+- lib/redis_alerting/redis_publisher.rb
 - lib/redis_alerting/version.rb
 - redis_alerting.gemspec
 - spec/lib/redis_alerting/engine_spec.rb