qpush 0.1.2 → 0.1.4

data/lib/qpush/server/queue.rb

@@ -14,7 +14,7 @@ module QPush
       def start
         until @done
           job = retrieve_job
-          job.api.setup if job
+          job.setup if job
         end
       end
 
@@ -29,7 +29,7 @@ module QPush
       # Performs a 'blocking pop' on our redis job list.
       #
       def retrieve_job
-        json = QPush.redis.with { |c| c.brpop(QPush.config.queue_namespace) }
+        json = QPush.redis.with { |c| c.brpop(QPush.keys.queue) }
         Job.new(JSON.parse(json.last))
       rescue => e
         raise ServerError, e.message

data/lib/qpush/server/worker.rb

@@ -56,6 +56,7 @@ module QPush
         @perform_threads.times { @workers << Perform.new }
         @queue_threads.times { @workers << Queue.new }
         @delay_threads.times { @workers << Delay.new }
+        @workers << Heartbeat.new
       end
 
       # Information about the start process

data/lib/qpush/version.rb

@@ -1,4 +1,4 @@
 module QPush
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
   CODENAME = 'Sun Soaked Salamander'
 end

data/lib/qpush/web.rb

@@ -1,7 +1,16 @@
 # Base
 require 'qpush/base'
 
-# Web
+# Web Base
 require 'sinatra/base'
 require 'qpush/web/get'
 require 'qpush/web/server'
+
+# Web Apis
+require 'qpush/web/apis/crons'
+require 'qpush/web/apis/heart'
+require 'qpush/web/apis/history'
+require 'qpush/web/apis/jobs'
+require 'qpush/web/apis/morgue'
+require 'qpush/web/apis/retries'
+require 'qpush/web/apis/stats'

data/lib/qpush/web/apis/crons.rb

@@ -0,0 +1,34 @@
+module QPush
+  module Web
+    module Apis
+      class Crons
+        def initialize(start, count)
+          @jobs = nil
+          @start = start ? start.to_i : 0
+          @count = count ? count.to_i : 10
+        end
+
+        def call
+          retrieve_delays
+          filter_crons
+        end
+
+        private
+
+        def retrieve_delays
+          @jobs = QPush.redis.with do |conn|
+            conn.zrange(QPush.keys.delay, 0, -1, with_scores: true)
+          end
+        end
+
+        def filter_crons
+          @jobs.map! do |job|
+            hash = JSON.parse(job.first).merge(perform_at: job.last)
+            hash['cron'].empty? ? next : hash
+          end
+          @jobs.compact[@start, @count]
+        end
+      end
+    end
+  end
+end

data/lib/qpush/web/apis/heart.rb

@@ -0,0 +1,12 @@
+module QPush
+  module Web
+    module Apis
+      class Heart
+        def call
+          heart = QPush.redis.with { |c| c.get(QPush.keys.heart) }
+          { status: !heart.nil?, namespace: QPush.config.namespace }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module QPush
+  module Web
+    module Apis
+      class History
+        def initialize
+          @jobs = nil
+        end
+
+        def call
+          retrieve_jobs
+          update_jobs
+        end
+
+        private
+
+        def retrieve_jobs
+          @jobs = QPush.redis.with do |conn|
+            conn.lrange(QPush.keys.history, 0, 10)
+          end
+        end
+
+        def update_jobs
+          @jobs.map! { |i| JSON.parse(i) }
+        end
+      end
+    end
+  end
+end

data/lib/qpush/web/apis/jobs.rb

@@ -0,0 +1,26 @@
+module QPush
+  module Web
+    module Apis
+      class Jobs
+        def initialize
+          @jobs = nil
+        end
+
+        def call
+          retrieve_jobs
+          update_jobs
+        end
+
+        private
+
+        def retrieve_jobs
+          QPush.redis.with { |c| @jobs = c.smembers("#{QPush.keys.jobs}") }
+        end
+
+        def update_jobs
+          @jobs.map! { |job| { klass: job } }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module QPush
+  module Web
+    module Apis
+      class Morgue
+        def initialize(start, count)
+          @morgue = nil
+          @start = start
+          @count = count
+        end
+
+        def call
+          retrieve_morgue
+          update_morgue
+        end
+
+        private
+
+        def retrieve_morgue
+          @morgue = QPush.redis.with do |conn|
+            conn.lrange(QPush.keys.morgue, @start, @start + @count)
+          end
+        end
+
+        def update_morgue
+          @morgue.map! { |i| JSON.parse(i) }
+        end
+      end
+    end
+  end
+end

data/lib/qpush/web/apis/queue_delayed.rb

@@ -0,0 +1,29 @@
+module QPush
+  module Web
+    module Apis
+      class QueueDelayed
+        def initialize(id, score)
+          @id = id
+          @score = score
+        end
+
+        def call
+          QPush.redis.with do |conn|
+            @conn = conn
+            watch_delay { retrieve_delay }
+          end
+        end
+
+        private
+
+        def retrieve_delay
+          delays = @conn.zrangebyscore(QPush.keys.delay, @score, @score)
+          delays.each
+
+        # Performs a watch on our delay list
+        #
+        def watch_delay
+          @conn.watch(QPush.keys.delay) do
+            yield if block_given?
+          end
+        end

data/lib/qpush/web/apis/retries.rb

@@ -0,0 +1,40 @@
+module QPush
+  module Web
+    module Apis
+      class Retries
+        def initialize(start, count)
+          @start = start ? start.to_i : 0
+          @count = count ? count.to_i : 10
+          @jobs = nil
+        end
+
+        def call
+          retrieve_jobs
+          update_jobs
+          trim_jobs
+        end
+
+        private
+
+        def retrieve_jobs
+          @jobs = QPush.redis.with do |conn|
+            conn.zrange(QPush.keys.delay, 0, -1, with_scores: true)
+          end
+        end
+
+        def update_jobs
+          @jobs.map! do |job|
+            hash = JSON.parse(job.first, symbolize_names: true).merge(perform_at: job.last)
+            next unless hash[:failed]
+            hash
+          end
+        end
+
+        def trim_jobs
+          @jobs.compact!
+          @jobs[@start, @count]
+        end
+      end
+    end
+  end
+end

data/lib/qpush/web/apis/stats.rb

@@ -0,0 +1,58 @@
+module QPush
+  module Web
+    module Apis
+      class Stats
+        DEFAULTS = {
+          'queued' => 0,
+          'success' => 0,
+          'failed' => 0,
+          'performed' => 0,
+          'dead' => 0,
+          'retries' => 0,
+          'delayed' => 0,
+          'current_queue' => 0,
+          'percent_success' => 100.00
+        }.freeze
+
+        def initialize
+          @stats = nil
+        end
+
+        def call
+          retrieve_stats
+          apply_defaults
+          calculate_stats
+          @stats
+        end
+
+        private
+
+        def retrieve_stats
+          @stats = QPush.redis.with do |conn|
+            conn.hgetall(QPush.keys.stats)
+          end
+        end
+
+        def apply_defaults
+          @stats.each { |k, v| @stats[k] = v.to_i }
+          @stats = DEFAULTS.merge(@stats)
+        end
+
+        def calculate_stats
+          @stats['percent_success'] = calculate_success
+          @stats['current_queue'] = calculate_current
+        end
+
+        def calculate_success
+          (100.00 - ((@stats['failed'].to_f / @stats['performed'].to_f) * 100.00)).round(2)
+        end
+
+        def calculate_current
+          QPush.redis.with do |c|
+            QPush.keys.perform_lists.collect { |list| c.llen(list) }.reduce(:+)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/qpush/web/get.rb

@@ -1,57 +1,55 @@
+require 'byebug'
+
 module QPush
   module Web
     class Get
-      STATS = [:delayed,
-               :queued,
-               :performed,
-               :retries,
-               :success,
-               :failed].freeze
-
       class << self
         def stats
-          stats = {}
-          namespace = QPush.config.stats_namespace
-          QPush.redis.with do |conn|
-            STATS.each { |s| stats[s] = conn.get("#{namespace}:#{s}") }
-          end
-          stats
+          stats = Apis::Stats.new
+          stats.call.to_json
         end
 
-        def delays(s, e)
-          jobs = Get.all_delays[s, e]
-
-          jobs.map! { |job| JSON.parse(job.first).merge(perform_at: job.last) }
+        def heartbeat
+          heart = Apis::Heart.new
+          heart.call.to_json
         end
 
-        def crons(s, e)
-          jobs = Get.all_delays
+        def history
+          history = Apis::History.new
+          history.call.to_json
+        end
 
-          jobs.map! do |job|
-            hash = JSON.parse(job.first).merge(perform_at: job.last)
-            hash['cron'].empty? ? next : hash
-          end
+        def jobs
+          jobs = Apis::Jobs.new
+          jobs.call.to_json
+        end
 
-          jobs.compact![s, e]
+        def retries(s, c)
+          retries = Apis::Retries.new(s, c)
+          retries.call.to_json
+        end
 
-          { total: jobs.count, jobs: jobs }
+        def morgue(s, c)
+          morgue = Apis::Morgue.new(s, c)
+          morgue.call.to_json
         end
 
-        def fails(s, e)
-          jobs = Get.all_delays
+        def delays(s, e)
+          jobs = Get.all_delays[s, e]
 
-          jobs.map! do |job|
-            hash = JSON.parse(job.first).merge(perform_at: job.last)
-            hash['cron'].empty? && hash['total_fail'] > 0 ? hash : next
-          end
-          jobs.compact![s, e]
+          jobs.map! { |job| JSON.parse(job.first).merge(perform_at: job.last) }
+        end
 
-          { total: jobs.count, jobs: jobs }
+        def crons(s, c)
+          crons = Apis::Crons.new(s, c)
+          crons.call.to_json
         end
 
+
+
         def all_delays
           QPush.redis.with do |conn|
-            conn.zrange(QPush.config.delay_namespace, 0, -1, with_scores: true)
+            conn.zrange(QPush.keys.delay, 0, -1, with_scores: true)
           end
         end
       end

data/lib/qpush/web/post.rb

@@ -0,0 +1,8 @@
+module QPush
+  module Web
+    class Post
+      class << self
+        def queue_delayed(id, score)
+          queue = Apis::QueueDelayed.new(id)
+          queue.call.to_json
+        end

data/lib/qpush/web/server.rb

@@ -1,24 +1,53 @@
 module QPush
   module Web
     class Server < Sinatra::Base
+      set :public_folder, Gem::Specification.find_by_name('qpush').gem_dir + '/lib/qpush/web/public'
+
       before do
+        pass if request.path_info == '/'
         content_type :json
+        headers 'Access-Control-Allow-Origin' => '*',
+                'Access-Control-Allow-Methods' => ['OPTIONS', 'GET', 'POST']
+      end
+
+      get '/' do
+        File.read(File.join(settings.public_folder, 'index.html'))
       end
 
       get '/stats' do
-        Get.stats.to_json
+        Get.stats
+      end
+
+      get '/heartbeat' do
+        Get.heartbeat
+      end
+
+      get '/history' do
+        Get.history
+      end
+
+      get '/jobs' do
+        Get.jobs
+      end
+
+      post '/queue_delayed' do
+        Post.queue_delayed(params[:id], params[:score])
       end
 
       get '/delays' do
-        Get.delays(params[:start].to_i, params[:end].to_i).to_json
+        Get.delays(params[:start].to_i, params[:count].to_i).to_json
       end
 
       get '/crons' do
-        Get.crons(params[:start].to_i, params[:end].to_i).to_json
+        Get.crons(params[:start].to_i, params[:count].to_i)
+      end
+
+      get '/retries' do
+        Get.retries(params[:start], params[:count])
       end
 
-      get '/fails' do
-        Get.fails(params[:start].to_i, params[:end].to_i).to_json
+      get '/morgue' do
+        Get.morgue(params[:start].to_i, params[:count].to_i)
       end
     end
   end