suj-pusher 0.1.3 → 0.1.4

data/bin/pusher

@@ -20,14 +20,20 @@ class PusherDaemon < DaemonSpawn::Base
   end
 end
 
-redis = "redis://localhost:6379/pusher"
+redis_host = "localhost"
+redis_port = 6379
+redis_db = 0
+redis_namespace = "pusher"
 logdir = File.join(WORKDIR, "logs")
 piddir = File.join(WORKDIR, "pids")
 cerdir = File.join(WORKDIR, "certs")
 
 ARGV.options do |opts|
   opts.banner = BANNER
-  opts.on('-r REDIS', '--redis REDIS', String, 'Redis server to connect') { |r|redis = r }
+  opts.on('-h REDIS HOST', '--host REDIS HOST', String, 'Redis server to connect') { |host| redis_host = host }
+  opts.on('-P REDIS PORT', '--port REDIS PORT', String, 'Redis server port') { |port| redis_port = port }
+  opts.on('-b REDIS DB', '--db REDIS DB', String, 'Redis database number') { |db| redis_db = db }
+  opts.on('-n REDIS NAMESPACE', '--namespace REDIS NAMESPACE', String, 'Redis server namespace') { |name| redis_namespace = name }
   opts.on('-l LOGS', '--logdir LOGS', String, 'Logs destination directory') { |l| logdir = l }
   opts.on('-p PIDS', '--piddir PIDS', String, 'Pids destination diercoty') { |pid| piddir = pid }
   opts.on('-c CERTS', '--cerdir CERTS', String, 'Directory to store certificates') { |cert| cerdir = cert }
@@ -42,7 +48,10 @@ FileUtils.mkdir_p(piddir)
 
 config = Suj::Pusher::Configuration.new
 config.certs_path = cerdir
-config.redis = redis
+config.redis_host = redis_host
+config.redis_port = redis_port
+config.redis_db = redis_db
+config.redis_namespace = redis_namespace
 Suj::Pusher.config.update(config)
 
 PusherDaemon.spawn!(

data/lib/suj/pusher/configuration.rb

@@ -13,7 +13,10 @@ module Suj
       :certs_path,
       :workdir,
       :logger,
-      :redis
+      :redis_host,
+      :redis_port,
+      :redis_db,
+      :redis_namespace
     ]
 
     class Configuration < Struct.new(*CONFIG_ATTRS)
@@ -31,7 +34,10 @@ module Suj
       end
 
       def set_defaults
-        self.redis = "redis://localhost:6379"
+        self.redis_host = "localhost"
+        self.redis_port = 6379
+        self.redis_db = 0
+        self.redis_namespace = "pusher"
         self.logger = ::Logger.new(STDOUT)
       end
 

data/lib/suj/pusher/daemon.rb

@@ -15,7 +15,7 @@ module Suj
 
       def start
         info "Starting pusher daemon"
-        info " subsribe to push messages from #{Suj::Pusher.config.redis}"
+        info " subsribe to push messages from #{redis_url} namespace #{redis_namespace}"
         EM.run do
           wait_msg do |msg|
             begin
@@ -47,14 +47,14 @@ module Suj
       private
 
       def wait_msg
-        redis.on(:connected) { info "REDIS - Connected to Redis server" }
+        redis.on(:connected) { info "REDIS - Connected to Redis server #{redis_url}" }
         redis.on(:closed) { info "REDIS - Closed connection to Redis server" }
         redis.on(:failed) { info "REDIS - redis connection FAILED" }
         redis.on(:reconnected) { info "REDIS - Reconnected to Redis server" }
         redis.on(:disconnected) { info "REDIS - Disconnected from Redis server" }
         redis.on(:reconnect_failed) { info "REDIS - Reconnection attempt to Redis server FAILED" }
         # EM.add_periodic_timer(30) { redis.publish Suj::Pusher::QUEUE, "ECHO" }
-        redis.pubsub.subscribe(Suj::Pusher::QUEUE) do |msg|
+        redis.pubsub.subscribe("#{redis_namespace}:#{Suj::Pusher::QUEUE}") do |msg|
           if msg == "ECHO"
             info "REDIS - ECHO Received"
           elsif msg == "PUSH_MSG"
@@ -132,13 +132,21 @@ module Suj
         conn.deliver(msg)
       end
 
+      def redis_url
+        @redis_url ||= "redis://#{Suj::Pusher.config.redis_host}:#{Suj::Pusher.config.redis_port}/#{Suj::Pusher.config.redis_db}"
+      end
+
+      def redis_namespace
+        Suj::Pusher.config.redis_namespace
+      end
+
       def redis
-        @redis ||= EM::Hiredis.connect(Suj::Pusher.config.redis)
+        @redis ||= EM::Hiredis.connect(redis_url)
       end
 
       def get_message
-        @redis_connection ||= EM::Hiredis.connect(Suj::Pusher.config.redis)
-        @redis_connection.rpop MSG_QUEUE
+        @redis_connection ||= EM::Hiredis.connect(redis_url)
+        @redis_connection.rpop "#{redis_namespace}:#{MSG_QUEUE}"
       end
 
       def pool

data/lib/suj/pusher/version.rb

@@ -1,5 +1,5 @@
 module Suj
   module Pusher
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suj-pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &24896380 !ruby/object:Gem::Requirement
+  requirement: &18305600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24896380
+  version_requirements: *18305600
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &24895960 !ruby/object:Gem::Requirement
+  requirement: &18303540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24895960
+  version_requirements: *18303540
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &24895540 !ruby/object:Gem::Requirement
+  requirement: &24562640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24895540
+  version_requirements: *24562640
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
-  requirement: &24895120 !ruby/object:Gem::Requirement
+  requirement: &24562220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24895120
+  version_requirements: *24562220
 description: Stand alone push notification server for APN and GCM.
 email:
 - rd@skillupjapan.co.jp