queue_classic 2.0.0rc11 → 2.0.0rc12

data/lib/queue_classic.rb

@@ -1,9 +1,9 @@
+require "scrolls"
 require "pg"
 require "uri"
 
 $: << File.expand_path(__FILE__, "lib")
 
-require "queue_classic/scrolls"
 require "queue_classic/okjson"
 require "queue_classic/conn"
 require "queue_classic/queries"
@@ -11,7 +11,7 @@ require "queue_classic/queue"
 require "queue_classic/worker"
 
 module QC
-  # ENV["QC_LOG_LEVEL"] is used in Scrolls
+  # ENV["LOG_LEVEL"] is used in Scrolls
   Scrolls::Log.start
 
   Root = File.expand_path("..", File.dirname(__FILE__))

data/readme.md

@@ -1,6 +1,6 @@
 # queue_classic
 
-v2.0.0rc9
+v2.0.0rc12
 
 queue_classic is a PostgreSQL-backed queueing library that is focused on
 concurrent job locking, minimizing database load & providing a simple &

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc11
+  version: 2.0.0rc12
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &14553400 !ruby/object:Gem::Requirement
+  requirement: &11432220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 0.13.2
   type: :runtime
   prerelease: false
-  version_requirements: *14553400
+  version_requirements: *11432220
+- !ruby/object:Gem::Dependency
+  name: scrolls
+  requirement: &11431140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *11431140
 description: queue_classic is a queueing library for Ruby apps. (Rails, Sinatra, Etc...)
   queue_classic features asynchronous job polling, database maintained locks and no
   ridiculous dependencies. As a matter of fact, queue_classic only requires pg.
@@ -36,7 +47,6 @@ files:
 - lib/queue_classic/conn.rb
 - lib/queue_classic/okjson.rb
 - lib/queue_classic/worker.rb
-- lib/queue_classic/scrolls.rb
 - lib/queue_classic/queue.rb
 - lib/queue_classic/tasks.rb
 - lib/queue_classic/queries.rb

data/lib/queue_classic/scrolls.rb

@@ -1,127 +0,0 @@
-require "thread"
-
-module Scrolls
-  extend self
-
-  def log(data, &blk)
-    Log.log(data, &blk)
-  end
-
-  def log_exception(data, e)
-    Log.log_exception(data, e)
-  end
-
-  module Log
-    extend self
-
-    LOG_LEVEL = (ENV["QC_LOG_LEVEL"] || 3).to_i
-    LOG_LEVEL_MAP = {
-      "fatal" => 0,
-      "error" => 1,
-      "warn"  => 2,
-      "info"  => 3,
-      "debug" => 4
-    }
-
-    attr_accessor :stream
-
-    def start(out = nil)
-      # This allows log_exceptions below to pick up the defined output,
-      # otherwise stream out to STDERR
-      @defined = out.nil? ? false : true
-      sync_stream(out)
-    end
-
-    def sync_stream(out = nil)
-      out = STDOUT if out.nil?
-      @stream = out
-      @stream.sync = true
-    end
-
-    def mtx
-      @mtx ||= Mutex.new
-    end
-
-    def write(data)
-      if log_level_ok?(data[:level])
-        msg = unparse(data)
-        mtx.synchronize do
-          @stream.puts(msg)
-        end
-      end
-    end
-
-    def unparse(data)
-      data.map do |(k, v)|
-        if (v == true)
-          k.to_s
-        elsif v.is_a?(Float)
-          "#{k}=#{format("%.3f", v)}"
-        elsif v.nil?
-          nil
-        else
-          v_str = v.to_s
-          if (v_str =~ /^[a-zA-z0-9\-\_\.]+$/)
-            "#{k}=#{v_str}"
-          else
-            "#{k}=\"#{v_str.sub(/".*/, "...")}\""
-          end
-        end
-      end.compact.join(" ")
-    end
-
-    def log(data, &blk)
-      unless blk
-        write(data)
-      else
-        start = Time.now
-        res = nil
-        log(data.merge(:at => :start))
-        begin
-          res = yield
-        rescue StandardError, Timeout::Error => e
-          log(data.merge(
-            :at           => :exception,
-            :reraise      => true,
-            :class        => e.class,
-            :message      => e.message,
-            :exception_id => e.object_id.abs,
-            :elapsed      => Time.now - start
-          ))
-          raise(e)
-        end
-        log(data.merge(:at => :finish, :elapsed => Time.now - start))
-        res
-      end
-    end
-
-    def log_exception(data, e)
-      sync_stream(STDERR) unless @defined
-      log(data.merge(
-        :exception    => true,
-        :class        => e.class,
-        :message      => e.message,
-        :exception_id => e.object_id.abs
-      ))
-      if e.backtrace
-        bt = e.backtrace.reverse
-        bt[0, bt.size-6].each do |line|
-          log(data.merge(
-            :exception    => true,
-            :exception_id => e.object_id.abs,
-            :site         => line.gsub(/[`'"]/, "")
-          ))
-        end
-      end
-    end
-
-    def log_level_ok?(level)
-      if level
-        LOG_LEVEL_MAP[level.to_s] <= LOG_LEVEL
-      else
-        true
-      end
-    end
-
-  end
-end