redreloader 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07958a6733f800644c2dc175acee41e5e62113b7
-  data.tar.gz: bca54c86f52c6651881379bd56619236441c430a
+  metadata.gz: c8206d6f3e0d9744770bad233bd3aa8f87333305
+  data.tar.gz: 12c2445596b89e6ea858093f1b1175cf782a813a
 SHA512:
-  metadata.gz: 2bb094bf91c15fda1d7a0e84d4db93004b5efa8143da2456024968ccc8a6b8a074d15fbf8d0aae2c24500b8896ba01adb048e6ebfb6914719b27045f1110b697
-  data.tar.gz: 02725eb98a788527207eb1c2dc96a8d2fdfe1fb85a3a0044e1e205930ca4a6d40ccb29585eec5564b0e5d9588958e74fdae4063f1f5459143fd049e979ab1677
+  metadata.gz: afd2c7d5061cc33b8ef00738ea676f44f8e5777a8b9715053b35223a850358b26a3a9b34b8b5aa3f88622002c5356382681c185b4ad9ec8859414d9a17f43381
+  data.tar.gz: 6fe84c38de23979a2eaf406a14cf82ee83cf7397e026edfe1fe895a0ed0929154ae7c614c21e5f19a7fe48c57c4b5f5d9727e16e6410bc08c1dd40e25c74b401

data/CHANGELOG

@@ -1,2 +1,3 @@
+v0.3. use Pub/sub to watch for changes instead of polling
 v0.2. fix dependency in binary
 v0.1. redreloader downloads a file from redis and runs a command on change

data/bin/redreloader

@@ -9,7 +9,7 @@ fn ||= '/etc/redreloader.conf'
 config = YAML::load(File.read(fn))
 puts config.inspect
 
-Redreloader.redis = Redis.new(config['redis'])
+client = Redreloader.new(config['redis'])
 
 def log(str)
   puts "[#{Time.now}] ---> #{str}"
@@ -23,14 +23,17 @@ end
 
 digest = Redreloader.calcmd5(File.read(config['file']))
 
-run! config['command']
+#run! config['command']
 
-loop do
-  Redreloader.if_changed_from(config['key'], digest) do |newdata, newdigest|
-    log "File changed"
+begin
+  client.process_changes(config['key'], digest) do |newdata, newdigest|
+    log "File changed (#{newdata.length} bytes)"
     File.open(config['file'], 'w') {|io| io.write(newdata) }
     digest = newdigest
     run! config['command']
   end
-  sleep config['interval'] || 1
+rescue Redis::BaseConnectionError => error
+  log "#{error}, retrying in 3"
+  sleep 3
+  retry
 end

data/lib/redreloader.rb

@@ -3,41 +3,55 @@ require 'zlib'
 require 'digest/md5'
 
 class Redreloader
-  class << self
-    attr_accessor :redis
-    attr_accessor :ttl
-    
-    def [](key)
-      val = with_binary_redis { @redis.getrange(key, 16, -1) }
-      Zlib::Inflate.inflate(val) if val && val != ""
-    end
-    
-    def []=(key, val)
-      with_binary_redis { @redis.set(key, calcmd5(val) + Zlib::Deflate.deflate(val), ex: @ttl) }
-    end
+  def initialize(redis_config)
+    @redis = Redis.new(redis_config)
+    @redis_sub = Redis.new(redis_config)
+  end
 
-    def calcmd5(val)
-      Digest::MD5.digest val
-    end
+  def [](key)
+    val = with_binary_redis { @redis.getrange(key, 16, -1) }
+    Zlib::Inflate.inflate(val) if val && val != ""
+  end
 
-    def digest(key)
-      data = with_binary_redis { @redis.getrange(key, 0, 15) }
-      data if data != ""
-    end
+  def []=(key, val)
+  with_binary_redis { @redis.set(key, self.class.calcmd5(val) + Zlib::Deflate.deflate(val)) }
+end
+
+  def self.calcmd5(val)
+    Digest::MD5.digest val
+  end
 
-    def if_changed_from(key, old_digest)
-      if (new_digest = digest(key)) && new_digest != old_digest
-        newdata = self[key]
-        yield(newdata, new_digest) if newdata
+  def digest(key)
+    data = with_binary_redis { @redis.getrange(key, 0, 15) }
+    data if data != ""
+  end
+
+  def process_changes(key, old_digest, &bl)
+    @redis_sub.subscribe("__keyspace@0__:#{key}") do |on|
+      on.message do |channel, message|
+        old_digest = yield_if_changed(key, old_digest, &bl)
+      end
+
+      on.subscribe do |channel, message|
+        # run it here to avoid race condition of change between check and subscribe
+        old_digest = yield_if_changed(key, old_digest, &bl)
       end
     end
-    
-    def with_binary_redis
-      original_encoding = Encoding.default_external
-      Encoding.default_external = Encoding.find('binary')
-      yield
-    ensure
-      Encoding.default_external = original_encoding
+  end
+
+  def yield_if_changed(key, old_digest, &bl)
+    if (new_digest = digest(key)) && new_digest != old_digest
+      newdata = self[key]
+      bl.call(newdata, new_digest) if newdata
     end
+    new_digest
+  end
+
+  def with_binary_redis
+    original_encoding = Encoding.default_external
+    Encoding.default_external = Encoding.find('binary')
+    yield
+  ensure
+    Encoding.default_external = original_encoding
   end
 end

data/redreloader.example.conf

@@ -2,7 +2,7 @@ redis:
     host: localhost
     port: 6379
     db: 0
+    timeout: 0
 command: cat myfile.txt
 file: myfile.txt
 key: config:myfile
-interval: 0.3

data/redreloader.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: redreloader 0.2 ruby lib
+# stub: redreloader 0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "redreloader"
-  s.version = "0.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Andrew Snow "]
-  s.date = "2014-08-30"
+  s.date = "2015-11-21"
   s.description = "Transfers file from redis and runs a command whenever it changes"
   s.email = "andrew@modulus.org"
   s.executables = ["redreloader"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/andys/redreloader"
   s.rdoc_options = ["--line-numbers", "--title", "Redreloader"]
   s.rubyforge_project = "redreloader"
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "Transfers file from redis and runs a command whenever it changes"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: redreloader
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - 'Andrew Snow '
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Transfers file from redis and runs a command whenever it changes
@@ -46,24 +46,24 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --title
+- "--line-numbers"
+- "--title"
 - Redreloader
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: redreloader
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Transfers file from redis and runs a command whenever it changes