suj-pusher 0.1.0 → 0.1.3

data/README.md

@@ -133,8 +133,11 @@ msg_json = MultiJson.dump(msg)
 # Obtain a redis instance
 redis = Redis.new({ host: "localhost", port: 6379})
 
-# Push the message to the *suj_pusher_queue* in the redis server.
-redis.publish "suj_pusher_queue", msg_json
+# Push the message to the *suj_pusher_queue* in the redis server:
+redis.lpush "suj_pusher_msgs", msg_json
+
+# Notify workers there is a new message
+redis.publish "suj_pusher_queue", "PUSH_MSG"
 ```
 
 You must push the messages to the *suj_pusher_queue* queue that is the one the Pusher daemon is listening to. Also make sure your message follows the format described on the previous sections.

data/bin/pusher

@@ -11,21 +11,6 @@ WORKDIR = Dir.pwd
 
 class PusherDaemon < DaemonSpawn::Base
   def start(args)
-    config = Suj::Pusher::Configuration.new
-    args.options do |opts|
-      opts.banner = BANNER
-      opts.on('-r REDIS', '--redis REDIS', String, 'Redis server to connect') { |redis| config.redis = redis }
-      opts.on('-v', '--version', 'Print this version of rapns.') { puts "rapns #{Suj::Pusher::VERSION}"; exit }
-      opts.on('-h', '--help', 'You\'re looking at it.') { puts opts; exit }
-      opts.parse!
-    end
-
-    config.certs_path = File.join(WORKDIR, "certs")
-    FileUtils.mkdir_p(config.certs_path)
-    FileUtils.mkdir_p(File.join(WORKDIR, "logs"))
-    FileUtils.mkdir_p(File.join(WORKDIR, "tmp/pids"))
-    Suj::Pusher.config.update(config)
-
     @daemon = Suj::Pusher::Daemon.new
     @daemon.start
   end
@@ -35,7 +20,34 @@ class PusherDaemon < DaemonSpawn::Base
   end
 end
 
+redis = "redis://localhost:6379/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('-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 }
+  opts.on('-v', '--version', 'Print this version of pusher daemon.') { puts "rapns #{Suj::Pusher::VERSION}"; exit }
+  opts.on('-h', '--help', 'You\'re looking at it.') { puts opts; exit }
+  opts.parse!
+end
+
+FileUtils.mkdir_p(cerdir)
+FileUtils.mkdir_p(logdir)
+FileUtils.mkdir_p(piddir)
+
+config = Suj::Pusher::Configuration.new
+config.certs_path = cerdir
+config.redis = redis
+Suj::Pusher.config.update(config)
+
 PusherDaemon.spawn!(
   sync_log: true,
-  working_dir: Dir.pwd
+  working_dir: Dir.pwd,
+  log_file: File.join(logdir, "pusher-worker.log"),
+  pid_file: File.join(piddir, "pusher-worker.pid")
 )

data/lib/suj/pusher/daemon.rb

@@ -15,6 +15,7 @@ module Suj
 
       def start
         info "Starting pusher daemon"
+        info " subsribe to push messages from #{Suj::Pusher.config.redis}"
         EM.run do
           wait_msg do |msg|
             begin

data/lib/suj/pusher/version.rb

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

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: suj-pusher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
 - Horacio Sanson
-- Fernando Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24896380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24896380
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24895960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24895960
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24895540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24895540
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24895120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,12 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24895120
 description: Stand alone push notification server for APN and GCM.
 email:
 - rd@skillupjapan.co.jp
@@ -118,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Stand alone push notification server.