qless 0.10.0 → 0.10.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4d96d36c55d04e6bb3287f32c3bc03f168d602ed
+  data.tar.gz: 1f3bfe923ac481a1d3b8c53eb33ea2709ac7b650
+SHA512:
+  metadata.gz: e5574d01d86fa501ee6e80e9cb6c73013b67065a23d8a9ee019c099f5273f837d8cd354152d79fc8645674cc50ed3d82ce037a2eebf4d74200ff5dee043b1185
+  data.tar.gz: 78199f3f81d6f768375ae2769edfd0bea29b47ff2648263781d2d2a6e0c1246624e911fd0cd5a9d789960d2fd87bb173daba739c48e2458c179f2f33dc3004df

data/Gemfile

@@ -9,8 +9,16 @@ end
 
 group :development do
   gem 'byebug', :platforms => [:ruby_20, :ruby_21]
+  gem 'cane', :platforms => [:ruby_20, :ruby_21]
+  gem 'poltergeist', '~> 1.0.0'
   gem 'pry'
   gem 'pry-byebug', :platforms => [:ruby_20, :ruby_21]
   gem 'pry-stack_explorer'
-  gem 'cane', :platforms => [:ruby_20, :ruby_21]
+  gem 'rake'
+  gem 'rspec'
+  gem 'rspec-fire'
+  gem 'rubocop'
+  gem 'simplecov'
+  gem 'thin'
+  gem 'timecop'
 end

data/exe/qless-config

@@ -0,0 +1,45 @@
+#! /usr/bin/env ruby
+
+require 'json'
+require 'qless'
+require 'thor'
+
+class Configurator < Thor
+
+  class_option :redis, :default => 'redis://localhost:6379/0'
+
+  no_commands do
+    def qless
+      if @qless.nil?
+        @qless = Qless::Client.new(url: options[:redis])
+      end
+      @qless
+    end
+  end
+
+  desc 'dump', 'Get config and print to stdout'
+  def dump
+    puts JSON.pretty_generate(qless.config.all)
+  end
+
+  desc 'load <filename> [--clear]', 'Set config from a file and command-line args'
+  option :clear, :type => :boolean, :default => false
+  def load(filename)
+    File.open(filename) do |file|
+      values = JSON.load(file)
+
+      if options[:clear]
+        (qless.config.all.keys - values.keys).each do |key|
+          qless.config.clear(key)
+        end
+      end
+
+      values.each do |key, value|
+        qless.config[key] = value
+      end
+    end
+  end
+
+end
+
+Configurator.start(ARGV)

data/lib/qless/job.rb

@@ -160,7 +160,7 @@ module Qless
     end
 
     def description
-      "#{@klass_name} (#{@jid} / #{@queue_name} / #{@state})"
+      "#{@klass_name} (#{@jid} / #{@queue_name} / #{@state} / #{@data})"
     end
 
     def inspect

data/lib/qless/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 
 module Qless
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/lib/qless/worker/base.rb

@@ -110,6 +110,7 @@ module Qless
 
       # Actually perform the job
       def perform(job)
+        start_time = Time.now.to_f
         around_perform(job)
       rescue JobLockLost
         log(:warn, "Lost lock for job #{job.jid}")
@@ -117,6 +118,9 @@ module Qless
         fail_job(job, error, caller)
       else
         try_complete(job)
+      ensure
+        elapsed_time = Time.now.to_f - start_time
+        log(:info, "Job #{job.description} took #{elapsed_time} seconds")
       end
 
       # Allow middleware modules to be mixed in and override the
@@ -150,7 +154,7 @@ module Qless
         @paused = false
       end
 
-      # Set the proceline. Not supported on all systems
+      # Set the procline. Not supported on all systems
       def procline(value, in_signal_handler=true)
         $0 = "Qless-#{Qless::VERSION}: #{value} at #{Time.now.iso8601}"
         log(:debug, $PROGRAM_NAME) unless in_signal_handler
@@ -168,7 +172,7 @@ module Qless
         #
         # We don't want to (or are able to) fail the job with this error in
         # any of these cases, so the best we can do is log the failure.
-        log(:error, "Failed to complete #{job.inspect}: #{e.message}")
+        log(:warn, "Failed to complete #{job.inspect}: #{e.message}")
       end
 
       def fail_job(job, error, worker_backtrace)

data/lib/qless/worker/forking.rb

@@ -119,7 +119,7 @@ module Qless
             # Wait for any child to kick the bucket
             pid, status = Process.wait2
             code, sig = status.exitstatus, status.stopsig
-            log(:warn,
+            log((code == 0 ? :info : :warn),
               "Worker process #{pid} died with #{code} from signal (#{sig})")
 
             # allow our shutdown logic (called from a separate thread) to take affect.
@@ -225,7 +225,7 @@ module Qless
           cpid = fork_child_process
 
           # If we're the parent process, ave information about the child
-          log(:warn, "Spawned worker #{cpid} to replace #{pid}")
+          log(:info, "Spawned worker #{cpid} to replace #{pid}")
           @sandboxes[cpid] = slot
         end
       end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qless
 version: !ruby/object:Gem::Version
-  version: 0.10.0
-  prerelease: 
+  version: 0.10.1
 platform: ruby
 authors:
 - Dan Lecocq
@@ -10,281 +9,107 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: metriks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: vegas
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.11
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-- !ruby/object:Gem::Dependency
-  name: rspec-fire
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
+        version: '2.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sentry-raven
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: metriks
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: 1.3.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: vegas
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :development
+        version: 0.1.11
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: rusage
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: thin
+  name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
+        version: 0.19.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
-description: ! "\n`qless` is meant to be a performant alternative to other queueing\nsystems,
+        version: 0.19.1
+description: "\n`qless` is meant to be a performant alternative to other queueing\nsystems,
   with statistics collection, a browser interface, and\nstrong guarantees about job
   losses.\n\nIt's written as a collection of Lua scipts that are loaded into the\nRedis
   instance to be used, and then executed by the client library.\nAs such, it's intended
@@ -296,19 +121,26 @@ email:
 - myron@moz.com
 executables:
 - qless-web
+- qless-config
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - Gemfile
-- Rakefile
 - HISTORY.md
+- README.md
+- Rakefile
+- exe/install_phantomjs
+- exe/qless-config
+- exe/qless-web
+- lib/qless.rb
 - lib/qless/config.rb
 - lib/qless/failure_formatter.rb
 - lib/qless/job.rb
 - lib/qless/job_reservers/ordered.rb
 - lib/qless/job_reservers/round_robin.rb
 - lib/qless/job_reservers/shuffled_round_robin.rb
+- lib/qless/lua/qless-lib.lua
+- lib/qless/lua/qless.lua
 - lib/qless/lua_script.rb
 - lib/qless/middleware/memory_usage_monitor.rb
 - lib/qless/middleware/metriks.rb
@@ -319,19 +151,6 @@ files:
 - lib/qless/middleware/timeout.rb
 - lib/qless/queue.rb
 - lib/qless/server.rb
-- lib/qless/subscriber.rb
-- lib/qless/tasks.rb
-- lib/qless/test_helpers/worker_helpers.rb
-- lib/qless/version.rb
-- lib/qless/worker/base.rb
-- lib/qless/worker/forking.rb
-- lib/qless/worker/serial.rb
-- lib/qless/worker.rb
-- lib/qless.rb
-- lib/qless/lua/qless-lib.lua
-- lib/qless/lua/qless.lua
-- exe/install_phantomjs
-- exe/qless-web
 - lib/qless/server/static/css/bootstrap-responsive.css
 - lib/qless/server/static/css/bootstrap-responsive.min.css
 - lib/qless/server/static/css/bootstrap.css
@@ -380,28 +199,35 @@ files:
 - lib/qless/server/views/track.erb
 - lib/qless/server/views/worker.erb
 - lib/qless/server/views/workers.erb
+- lib/qless/subscriber.rb
+- lib/qless/tasks.rb
+- lib/qless/test_helpers/worker_helpers.rb
+- lib/qless/version.rb
+- lib/qless/worker.rb
+- lib/qless/worker/base.rb
+- lib/qless/worker/forking.rb
+- lib/qless/worker/serial.rb
 homepage: http://github.com/seomoz/qless
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: qless
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Redis-Based Queueing System
 test_files: []