qpush 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a15d5df46ac29fd256af5b940ea82249588729
-  data.tar.gz: 62a42bc427451e3d47f0d2a3ac38eaafcdee4020
+  metadata.gz: c81c28b25016af05e8ab1560015b659c073fb19a
+  data.tar.gz: 8e08d686417972044dc952001bd521bdf3a1b700
 SHA512:
-  metadata.gz: 283c6796ce8f178a7a5cb3722f73716c31bc50bd3522dd68ff74a70b597a7ba728094fdd688e70f74fdb4ae3f9aff8e943209f878ab60f81198fbd39a344af83
-  data.tar.gz: df33a1a4d1fd0c9efd339c17866f4db22ad0c7d05b62d6ee92f656f9adb94d6cf646fa937cca0d3f942a28fb9768cdbd1a8b7f1303e78c191639999e384fcdd4
+  metadata.gz: 90b802ddd706fd24e326e15b1fa4ca4a9a7578dcd87c10512fea84e148b8506b8a34f17b30be996ce9c122dfe4ed95b1ec785a54c5e4e6d5194c49b853f262b1
+  data.tar.gz: 69302a4491443410a50827ea88b50a3070917c6c108d515eb9ebd3afa2702d33f2f3f549ca9ee688f337c2f862db814ba1c09d7d0de9f36ab5423353b4a88a6b

data/.byebug_history

@@ -1,3 +1,77 @@
+c
+request.path_info
+c
+hash
+c
+@jobs.compact[@start, @count]
+@jobs.compact
+@jobs.compact!
+@count
+@start
+@jobs
+c
+@count
+@start
+@jobs
+c
+ Delay.call(@job, :delay)
+c
+Delay.call(@job)
+c
+@stats.each_key { |key| puts key }
+@stats.each_key { |key| @stats[key].to_i }
+@stats
+c
+@stats
+c
+quit
+Perform.call(@job)
+c
+Perform.call(@job)
+c
+@job
+invalid_job && return unless @job.valid?
+c
+job
+c
+@fails = @fails.compact[@start, @count]
+@fails
+@Fails
+@fails.compact!
+@fails.compact![@start..@count]
+@fails.compact![@start, @count]
+@fails.any?
+@count
+@start
+@fails
+c
+@fails
+c
+@fails
+c
+percent
+quit
+y
+q
+(100.00 - ((stats[:failed].to_f / stats[:performed].to_f) * 100.00)).round(2)
+100.00 - ((stats[:failed].to_f / stats[:performed].to_f) * 100.00)
+stats[:failed].to_f / stats[:performed].to_f
+stats[:failed].to_f
+stats[:failed].to_i / stats[:performed].to_i
+(stats[:failed] / stats[:performed])
+stats[:performed]
+stats[:failed]
+percent
+c
+conn.lrange("#{QPush.config.perform_namespace}:last_10", 0, 10)
+c
+json
+c
+conn.get("#{namespace}:#{s}")
+stats
+c
+nil.to_i
+stats
 quit
 Dir[Dir.pwd + "/lib/qpush/jobs/*.rb"]
 Dir[Dir.pwd + "/lib/jobs/*.rb"]

data/bin/qpush-server

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require 'qpush/server'
 
 server = QPush::Server::Launcher.new(ARGV)

data/bin/qpush-web

@@ -1 +1,7 @@
-exec( "bundle exec rackup lib/qpush/web/server.ru" )
+#!/usr/bin/env ruby
+
+require 'qpush/web'
+
+#Rack::Handler::Puma.run QPush::Web::Server
+
+exec('bundle exec rackup lib/qpush/web/server.ru')

data/jobs/fail_job.rb

@@ -0,0 +1,11 @@
+class FailJob
+  include QPush::Job
+
+  def initialize(options)
+    @option = options
+  end
+
+  def call
+    fail
+  end
+end

data/jobs/test_job.rb

@@ -1,4 +1,6 @@
 class TestJob
+  include QPush::Job
+
   def call
     puts 'Hello from TestJob'
   end

data/lib/qpush/config.rb

@@ -59,25 +59,5 @@ module QPush
         url: redis_url
       }
     end
-
-    def delay_namespace
-      @delay_namespace ||= "qpush:v1:#{@namespace}:delay"
-    end
-
-    def queue_namespace
-      @queue_namespace ||= "qpush:v1:#{@namespace}:queue"
-    end
-
-    def perform_namespace
-      @perform_namespace ||= "qpush:v1:#{@namespace}:perform"
-    end
-
-    def stats_namespace
-      @stats_namespace ||= "qpush:v1:#{@namespace}:stats"
-    end
-
-    def perform_lists
-      (1..priorities).collect { |num| "#{perform_namespace}:#{num}" }
-    end
   end
 end

data/lib/qpush/job.rb

@@ -9,13 +9,11 @@ module QPush
   module Job
     class << self
       def included(base)
-        base.extend(ClassMethods)
+        _register_job(base)
       end
-    end
 
-    module ClassMethods
-      def queue(options)
-        QPush.job(options.merge(klass: name))
+      def _register_job(base)
+        QPush.redis.with { |c| c.sadd(QPush.keys.jobs, base.name) }
       end
     end
 
@@ -23,7 +21,7 @@ module QPush
       attr_accessor :klass, :id, :priority, :created_at, :start_at,
                     :cron, :retry_max, :total_success, :total_fail,
                     :run_time, :namespace
-      attr_reader :args
+      attr_reader :args, :failed
 
       def initialize(options = {})
         options = defaults.merge(options)
@@ -39,6 +37,10 @@ module QPush
         @args = nil
       end
 
+      def failed=(failed)
+        @failed = failed == 'true' || failed == true
+      end
+
       def to_json
         { klass: @klass,
           id: @id,
@@ -49,6 +51,7 @@ module QPush
           retry_max: @retry_max,
           total_fail: @total_fail,
           total_success: @total_success,
+          failed: @failed,
           args: @args }.to_json
       end
 
@@ -64,6 +67,7 @@ module QPush
           retry_max: 10,
           total_fail: 0,
           total_success: 0,
+          failed: false,
           namespace: QPush.config.namespace }
       end
     end
@@ -71,7 +75,7 @@ module QPush
     class ClientWrapper < QPush::Job::Base
       def queue
         QPush.redis.with do |conn|
-          conn.incr("qpush:v1:#{@namespace}:stats:queued")
+          conn.hincrby("qpush:v1:#{@namespace}:stats", 'queued', 1)
           conn.lpush("qpush:v1:#{@namespace}:queue", to_json)
         end
       end

data/lib/qpush/jobs/queue_delayed.rb

@@ -0,0 +1,17 @@
+module QPush
+  module Jobs
+    class QueueDelayed
+      include QPush::Job
+
+      attr_accessor :id, :score
+
+      def initialize(options)
+        options.each { |key, value| send("#{key}=", value) }
+      end
+
+      def call
+        'hello'
+      end
+    end
+  end
+end

data/lib/qpush/redis.rb

@@ -5,6 +5,10 @@ module QPush
     def redis
       @redis_pool ||= RedisPool.create
     end
+
+    def keys
+      @keys ||= Rediskeys.new
+    end
   end
 
   class RedisPool
@@ -14,4 +18,36 @@ module QPush
       end
     end
   end
+
+  class Rediskeys
+    BASE = 'qpush:v1'.freeze
+    KEYS = [:delay,
+            :queue,
+            :perform,
+            :stats,
+            :heart,
+            :jobs,
+            :crons,
+            :history,
+            :morgue]
+
+    attr_reader :delay, :queue, :perform, :stats, :heart, :jobs,
+                :history, :morgue
+
+    def initialize
+      build_keyspaces
+    end
+
+    def perform_lists
+      (1..QPush.config.priorities).collect { |num| "#{perform}:#{num}" }
+    end
+
+    private
+
+    def build_keyspaces
+      KEYS.each do |key|
+        instance_variable_set("@#{key}", "#{BASE}:#{QPush.config.namespace}:#{key}")
+      end
+    end
+  end
 end

data/lib/qpush/server.rb

@@ -1,18 +1,36 @@
 # Base
 require 'qpush/base'
 
-# Server
+# Server Base
+require 'byebug'
 require 'sequel'
 require 'object_validator'
 require 'parse-cron'
+require 'forwardable'
+require 'qpush/server/apis'
 require 'qpush/server/database'
 require 'qpush/server/delay'
 require 'qpush/server/errors'
-require 'qpush/server/execute'
+require 'qpush/server/heartbeat'
 require 'qpush/server/jobs'
 require 'qpush/server/launcher'
+require 'qpush/server/loader'
 require 'qpush/server/logger'
 require 'qpush/server/manager'
 require 'qpush/server/perform'
 require 'qpush/server/queue'
 require 'qpush/server/worker'
+
+# Server Apis
+require 'qpush/server/apis/delay'
+require 'qpush/server/apis/execute'
+require 'qpush/server/apis/fail'
+require 'qpush/server/apis/history'
+require 'qpush/server/apis/perform'
+require 'qpush/server/apis/queue'
+require 'qpush/server/apis/morgue'
+require 'qpush/server/apis/setup'
+require 'qpush/server/apis/success'
+
+# Base Jobs
+require 'qpush/jobs/queue_delayed'

data/lib/qpush/server/apis.rb

@@ -0,0 +1,46 @@
+module QPush
+  module Server
+    module Apis
+      class Base
+        def self.call(*args)
+          api = new(*args)
+          api.call
+        end
+      end
+    end
+
+    class ApiWrapper
+      def initialize(job)
+        @job = job
+      end
+
+      def queue
+        Apis::Queue.call(@job)
+      end
+
+      def perform
+        Apis::Perform.call(@job)
+      end
+
+      def execute
+        Apis::Execute.call(@job)
+      end
+
+      def delay
+        Apis::Delay.call(@job, :delay)
+      end
+
+      def retry
+        Apis::Delay.call(@job, :retry)
+      end
+
+      def morgue
+        Apis::Morgue.call(@job)
+      end
+
+      def setup
+        Apis::Setup.call(@job)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module QPush
+  module Server
+    module Apis
+      class Delay < Base
+        def initialize(job, type)
+          @job = job
+          @type = type
+        end
+
+        def call
+          load_type
+          delay_job
+        end
+
+        private
+
+        def delay_job
+          QPush.redis.with do |conn|
+            conn.hincrby(QPush.keys.stats, @stat, 1)
+            conn.zadd(QPush.keys.delay, @time, @job.to_json)
+          end
+        end
+
+        def load_type
+          case @type
+          when :delay
+            @stat = 'delayed'
+            @time = @job.delay_until
+          when :retry
+            @stat = 'retries'
+            @time = @job.retry_at
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module QPush
+  module Server
+    module Apis
+      class Execute < Base
+        def initialize(job)
+          @job = job
+        end
+
+        def call
+          measure_run_time { job_object.call }
+          Success.call(@job)
+        rescue => e
+          Fail.call(@job, e)
+        end
+
+        private
+
+        def measure_run_time
+          start = Time.now
+          yield
+          finish = Time.now
+          @job.run_time = "#{((finish - start) * 1000.0).round(3)} ms"
+        end
+
+        def job_object
+          klass = Object.const_get(@job.klass)
+          @job.args.empty? ? klass.new : klass.new(@job.args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+module QPush
+  module Server
+    module Apis
+      class Fail < Base
+        def initialize(job, error)
+          @job = job
+          @error = error
+        end
+
+        def call
+          update_job
+          stat_increment
+          log_error
+          update_history
+        end
+
+        private
+
+        def update_job
+          @job.mark_failed
+          @job.retry if @job.retry_job?
+          @job.morgue if @job.dead_job?
+        end
+
+        def stat_increment
+          QPush.redis.with { |c| c.hincrby(QPush.keys.stats, 'failed', 1) }
+        end
+
+        def log_error
+          Server.log.err("Job FAILED | #{@job.klass} | #{@job.id} | #{@error.message}")
+        end
+
+        def update_history
+          History.call(@job, false, @error)
+        end
+      end
+    end
+  end
+end