redis-repeater 0.0.3 → 0.0.5

data/bin/redis-repeater

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/redis-repeater'
+require File.dirname(__FILE__) + '/../lib/redis_repeater'
 
 if ARGV.empty?
   puts "Please specify a config directory"

data/lib/{redis-repeater → redis_repeater}/scheduler.rb

@@ -4,19 +4,14 @@ module RedisRepeater
 
     def initialize(logger = nil)
       @logger = logger
+      @logger.info 'Running on schedule forever...'
     end
 
     # When adding, we move through the current queue, and
     # find the first one that is performing after we want to
     def <<(job)
       scheduler = self
-      EventMachine.run {
-        EventMachine::add_timer(job.timeout) { job.perform; scheduler << job }
-      }
-    end
-
-    def perform
-      @logger.info 'Running on schedule forever...'
+      EventMachine::add_timer(job.timeout) { job.perform; scheduler << job }
     end
 
   end

data/lib/{redis-repeater → redis_repeater}/transfer_scheduler_job.rb

@@ -13,6 +13,7 @@ module RedisRepeater
     def perform
       count = 0
       while (item = @redis_from.lpop @name)
+        # work the same direction resque does
         @redis_to.rpush(@name, item)
         count += 1
       end

data/lib/{redis-repeater → redis_repeater}/version.rb

@@ -1,5 +1,5 @@
 module RedisRepeater
 
-  VERSION = [0, 0, 3]
+  VERSION = [0, 0, 5]
 
 end

data/lib/redis_repeater.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/redis_repeater/scheduler.rb'
+require File.dirname(__FILE__) + '/redis_repeater/scheduler_job.rb'
+require File.dirname(__FILE__) + '/redis_repeater/transfer_scheduler_job.rb'
+
+require 'yaml'
+require 'logger'
+require 'fileutils'
+
+require 'eventmachine'
+require 'redis'
+
+module RedisRepeater
+ 
+  DefaultRedisHost = 'localhost'
+  DefaultRedisPort = 6379
+  LogDefaultFilename = File.dirname(__FILE__) + '/../log/redis_repeater.log'
+
+  def self.start(config_dir)
+
+    # Connect to redis
+    config = YAML::load File.open("#{config_dir}/config.yml")
+    redis_from = redis_configure(config, 'origin')
+    redis_to = redis_configure(config, 'destination')
+
+    # Load the queues from the config file
+    queues = YAML::load File.open("#{config_dir}/queues.yml")
+
+    # replace 'magic' resque:queues key with all resque queues, but don't overwrite otherwise configured queues
+    # warning: only resolves queue names on startup, if new queue is created it will not pick it up.
+    if queues.has_key?("resque:queues")
+      redis_from.smembers("resque:queues").each do |queue|
+        queues["resque:queue:#{queue}"] = queues["resque:queues"] unless queues.has_key?("resque:queue:#{queue}")
+      end
+      queues.delete("resque:queues")
+    end
+    
+    # Logger
+    if config.has_key?('log')
+      log_filename = config['log']
+      FileUtils.mkdir_p(File.dirname(log_filename))
+      logger = Logger.new(log_filename)
+    else
+      logger = Logger.new(STDOUT)
+    end
+
+    # Load the queues into the scheduler
+    scheduler = Scheduler.new(logger)
+    EventMachine::run do
+      queues.each do |name, timeout|
+        puts "#{name} - #{timeout}"
+        scheduler << TransferSchedulerJob.new(name, timeout, logger, redis_from, redis_to)
+      end
+    end
+
+    # Perform forever
+    scheduler.perform # TODO make configurable
+
+  end
+
+  def self.redis_configure(config, name)
+    host = DefaultRedisHost
+    port = DefaultRedisPort
+    if config.has_key?(name)
+      host = config[name]['host'] if config[name].has_key?('host')
+      port = config[name]['port'] if config[name].has_key?('port')
+    end
+    Redis.new(:host => host, :port => port)
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../lib/redis_repeater'
+
+SERVER_PORT = 6391
+CLIENT_PORT = 6392
+QN = 'queue-1234'
+
+SERVERS = ['client', 'server']
+
+def start_servers
+  SERVERS.each do |s|
+    print "starting a #{s}.. "
+    `redis-server #{File.dirname(__FILE__) + "/support/#{s}.conf"}`
+    puts 'DONE'
+  end
+end
+
+def stop_servers
+  SERVERS.each do |s|
+    pid = `cat #{s}.pidfile`.chop
+    print "stopping #{s} (PID:#{pid}).. "
+    `kill #{pid}`
+    puts 'DONE'
+  end
+end
+
+def start_repeater
+  print 'starting the repeater.. '
+  # TODO deamonize
+  @rthread = Thread.start do
+    RedisRepeater.start(File.dirname(__FILE__) + '/support/config')
+  end
+  puts 'DONE'
+end
+
+def stop_repeater
+  print 'stopping the repeater.. '
+  @rthread.kill
+  puts 'DONE'
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: redis-repeater
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -40,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -69,11 +55,12 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/redis-repeater/scheduler.rb
-- lib/redis-repeater/scheduler_job.rb
-- lib/redis-repeater/transfer_scheduler_job.rb
-- lib/redis-repeater/version.rb
-- lib/redis-repeater.rb
+- lib/redis_repeater/scheduler.rb
+- lib/redis_repeater/scheduler_job.rb
+- lib/redis_repeater/transfer_scheduler_job.rb
+- lib/redis_repeater/version.rb
+- lib/redis_repeater.rb
+- spec/spec_helper.rb
 - bin/redis-repeater
 has_rdoc: true
 homepage: http://seejohnrun.github.com/redis-repeater/
@@ -89,25 +76,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: redis-repeater
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Redis Repeater
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb

data/lib/redis-repeater.rb

@@ -1,56 +0,0 @@
-require File.dirname(__FILE__) + '/redis-repeater/scheduler.rb'
-require File.dirname(__FILE__) + '/redis-repeater/scheduler_job.rb'
-require File.dirname(__FILE__) + '/redis-repeater/transfer_scheduler_job.rb'
-
-require 'yaml'
-require 'logger'
-require 'fileutils'
-
-require 'rubygems'
-require 'redis'
-require 'eventmachine'
-
-module RedisRepeater
- 
-  DefaultRedisHost = 'localhost'
-  DefaultRedisPort = 6380
-  LogDefaultFilename = File.dirname(__FILE__) + '/../log/redis-repeater.log'
-
-  def self.start(config_dir)
-
-    # Connect to redis
-    config = YAML::load File.open("#{config_dir}/config.yml")
-    redis_from = redis_configure(config, 'origin')
-    redis_to = redis_configure(config, 'destination')
-
-    # Load the queues from the config file
-    queues = YAML::load File.open("#{config_dir}/queues.yml")
-
-    # Logger
-    log_filename = config.has_key?('log') ? config['log'] : LogDefaultFilename
-    log_path = File.dirname(log_filename)
-    FileUtils.mkdir_p(log_path)
-    logger = Logger.new(log_filename)
-
-    # Load the queues into the scheduler
-    scheduler = Scheduler.new(logger)
-    queues.each do |name, timeout|
-      scheduler << TransferSchedulerJob.new(name, timeout, logger, redis_from, redis_to)
-    end
-
-    # Perform forever
-    scheduler.perform # TODO make configurable
-
-  end
-
-  def self.redis_configure(config, name)
-    host = DefaultRedisHost
-    port = DefaultRedisPort
-    if config.has_key?(name)
-      host = config[name]['host'] if config[name].has_key?('host')
-      port = config[name]['port'] if config[name].has_key?('port')
-    end
-    Redis.new(:host => host, :port => port)
-  end
-
-end