qpush 0.1.2 → 0.1.4

data/lib/qpush/server/apis/history.rb

@@ -0,0 +1,36 @@
+module QPush
+  module Server
+    module Apis
+      class History < Base
+        def initialize(job, status, error)
+          @status = status
+          @klass = job.klass
+          @args = job.args
+          @performed = Time.now.to_i
+          @error = error ? error.message : nil
+        end
+
+        def call
+          update_history
+        end
+
+        private
+
+        def update_history
+          QPush.redis.with do |c|
+            c.lpush(QPush.keys.history, to_json)
+            c.ltrim(QPush.keys.history, 0, 10)
+          end
+        end
+
+        def to_json
+          { status: @status,
+            klass: @klass,
+            args: @args,
+            performed: @performed,
+            error: @error }.to_json
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/apis/morgue.rb

@@ -0,0 +1,24 @@
+module QPush
+  module Server
+    module Apis
+      class Morgue < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          send_to_morgue
+        end
+
+        private
+
+        def send_to_morgue
+          QPush.redis.with do |conn|
+            conn.hincrby(QPush.keys.stats, 'dead', 1)
+            conn.lpush(QPush.keys.morgue, @job.to_json)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/apis/perform.rb

@@ -0,0 +1,24 @@
+module QPush
+  module Server
+    module Apis
+      class Perform < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          perform_job
+        end
+
+        private
+
+        def perform_job
+          QPush.redis.with do |conn|
+            conn.hincrby(QPush.keys.stats, 'performed', 1)
+            conn.lpush("#{QPush.keys.perform}:#{@job.priority}", @job.to_json)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/apis/queue.rb

@@ -0,0 +1,24 @@
+module QPush
+  module Server
+    module Apis
+      class Queue < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          queue_job
+        end
+
+        private
+
+        def queue_job
+          QPush.redis.with do |conn|
+            conn.hincrby(QPush.keys.stats, 'queued', 1)
+            conn.lpush(QPush.keys.queue, @job.to_json)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/apis/setup.rb

@@ -0,0 +1,27 @@
+module QPush
+  module Server
+    module Apis
+      class Setup < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          invalid_job && return unless @job.valid?
+          setup_job
+        end
+
+        private
+
+        def setup_job
+          Perform.call(@job) if @job.perform_job?
+          Delay.call(@job, :delay) if @job.delay_job?
+        end
+
+        def invalid_job
+          Server.log.err("Job INVALID | #{@job.klass} | #{@job.id} | #{@job.errors.full_messages.join(' ')}")
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/apis/success.rb

@@ -0,0 +1,39 @@
+module QPush
+  module Server
+    module Apis
+      class Success < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          update_job
+          stat_increment
+          log_success
+          update_history
+        end
+
+        private
+
+        def update_job
+          @job.mark_success
+          @job.delay if @job.delay_job?
+        end
+
+        def stat_increment
+          QPush.redis.with do |c|
+            c.hincrby(QPush.keys.stats, 'success', 1)
+          end
+        end
+
+        def log_success
+          Server.log.info("Job SUCCESS | #{@job.klass} with ID: #{@job.id} | #{@job.run_time}")
+        end
+
+        def update_history
+          History.call(@job, true, nil)
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/delay.rb

@@ -22,7 +22,7 @@ module QPush
         end
       end
 
-      # Shutsdown our dleay process.
+      # Shutsdown our delay process.
       #
       def shutdown
         @done = true
@@ -34,7 +34,7 @@ module QPush
       # If any are found, begin to update them.
       #
       def retrieve_delays
-        delays = @conn.zrangebyscore(QPush.config.delay_namespace, 0, Time.now.to_i)
+        delays = @conn.zrangebyscore(QPush.keys.delay, 0, Time.now.to_i)
         delays.any? ? update_delays(delays) : @conn.unwatch
       end
 
@@ -42,7 +42,7 @@ module QPush
       #
       def update_delays(delays)
         @conn.multi do |multi|
-          multi.zrem(QPush.config.delay_namespace, delays)
+          multi.zrem(QPush.keys.delay, delays)
           delays.each { |job| perform_job(job) }
         end
       end
@@ -51,7 +51,7 @@ module QPush
       #
       def perform_job(json)
         job = Job.new(JSON.parse(json))
-        job.api.perform
+        job.perform
       rescue => e
         raise ServerError, e.message
       end
@@ -59,7 +59,7 @@ module QPush
       # Performs a watch on our delay list
       #
       def watch_delay
-        @conn.watch(QPush.config.delay_namespace) do
+        @conn.watch(QPush.keys.delay) do
           yield if block_given?
         end
       end

data/lib/qpush/server/errors.rb

@@ -1,18 +1,3 @@
 module QPush
-  class ServerError < StandardError
-    def initialize(msg = nil)
-      @message = msg
-      log_error
-    end
-
-    def message
-      "The following error occured: #{@message}"
-    end
-
-    private
-
-    def log_error
-      Server.log.err("Server Error - #{@message}")
-    end
-  end
+  class ServerError < StandardError; end
 end

data/lib/qpush/server/heartbeat.rb

@@ -0,0 +1,28 @@
+module QPush
+  module Server
+    # The Heartbeat worker periodically updates the heart namespace.
+    # The key is set with an expiry. This helps to indicate if the QPush server
+    # is currently active.
+    #
+    class Heartbeat
+      def initialize
+        @done = false
+      end
+
+      # Starts our perform process. This will run until instructed to stop.
+      #
+      def start
+        until @done
+          QPush.redis.with { |c| c.setex(QPush.keys.heart, 30, true) }
+          sleep 15
+        end
+      end
+
+      # Shutsdown our heartbeat process.
+      #
+      def shutdown
+        @done = true
+      end
+    end
+  end
+end

data/lib/qpush/server/jobs.rb

@@ -1,11 +1,13 @@
 module QPush
   module Server
     module JobHelpers
-      def bump_success
+      def mark_success
+        @failed = false
         @total_success += 1
       end
 
-      def bump_fail
+      def mark_failed
+        @failed = true
         @total_fail += 1
       end
 
@@ -45,15 +47,18 @@ module QPush
     end
 
     class Job < QPush::Job::Base
+      extend Forwardable
+
       include QPush::Server::JobHelpers
       include ObjectValidator::Validate
 
-      attr_reader :api
-
       def initialize(options)
         super
-        @api = JobApi.new(self)
+        @api = ApiWrapper.new(self)
       end
+
+      def_delegators :@api, :queue, :execute, :perform,
+                     :delay, :retry, :morgue, :setup
     end
 
     class JobValidator
@@ -73,55 +78,5 @@ module QPush
       validates :total_fail, type: Integer
       validates :total_success, type: Integer
     end
-
-    class JobApi
-      def initialize(job)
-        @job = job
-      end
-
-      def queue
-        QPush.redis.with do |conn|
-          conn.incr("#{QPush.config.stats_namespace}:queued")
-          conn.lpush("#{QPush.config.queue_namespace}", @job.to_json)
-        end
-      end
-
-      def execute
-        execute = Execute.new(@job)
-        execute.call
-      end
-
-      def perform
-        QPush.redis.with do |conn|
-          conn.incr("#{QPush.config.stats_namespace}:performed")
-          conn.lpush("#{QPush.config.perform_namespace}:#{@job.priority}", @job.to_json)
-        end
-      end
-
-      def delay
-        send_to_delay('delayed', @job.delay_until)
-      end
-
-      def retry
-        send_to_delay('retries', @job.retry_at)
-      end
-
-      def setup
-        fail unless @job.valid?
-        perform if @job.perform_job?
-        delay if @job.delay_job?
-      rescue
-        raise ServerError, 'Invalid job: ' + @job.errors.full_messages.join(' ')
-      end
-
-      private
-
-      def send_to_delay(stat, time)
-        QPush.redis.with do |conn|
-          conn.incr("#{QPush.config.stats_namespace}:#{stat}")
-          conn.zadd(QPush.config.delay_namespace, time, @job.to_json)
-        end
-      end
-    end
   end
 end

data/lib/qpush/server/launcher.rb

@@ -12,7 +12,7 @@ module QPush
       def start
         start_message
         setup_options
-        require_jobs
+        setup_jobs
         boot_manager
       end
 
@@ -39,10 +39,10 @@ module QPush
         parser.parse!(@argv)
       end
 
-      def require_jobs
-        Dir[Dir.pwd + "#{QPush.config.jobs_path}/**/*.rb"].each do |file|
-          require file
-        end
+      # Requires all base jobs as well as user jobs.
+      #
+      def setup_jobs
+        Loader.call
       end
 
       def boot_manager

data/lib/qpush/server/loader.rb

@@ -0,0 +1,38 @@
+module QPush
+  module Server
+    # The Loader will 'require' all jobs within the users job folder.
+    # The job folder is specified in the config.
+    #
+    class Loader
+      # Provides a shortend caller.
+      #
+      def self.call
+        jobs = Loader.new
+        jobs.call
+      end
+
+      # Entrypoint to load all jobs.
+      #
+      def call
+        remove_old
+        load_jobs
+      end
+
+      private
+
+      # Removes old jobs from the redis job list.
+      #
+      def remove_old
+        QPush.redis.with { |c| c.del(QPush.keys.jobs) }
+      end
+
+      # Requires user jobs that are specified from the config.
+      #
+      def load_jobs
+        Dir[Dir.pwd + "#{QPush.config.jobs_path}/**/*.rb"].each do |file|
+          require file
+        end
+      end
+    end
+  end
+end

data/lib/qpush/server/perform.rb

@@ -6,7 +6,7 @@ module QPush
     class Perform
       def initialize
         @done = false
-        @lists = QPush.config.perform_lists
+        @lists = QPush.keys.perform_lists
       end
 
       # Starts our perform process. This will run until instructed to stop.
@@ -14,7 +14,7 @@ module QPush
       def start
         until @done
           job = retrieve_job
-          job.api.execute if job
+          job.execute if job
         end
       end