Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump resque to 2.0.0 #14

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "http://rubygems.org"

gem 'resque', '~>1.19'
gem 'resque'
# Add dependencies required to use your gem here.
# Example:
# gem "activesupport", ">= 2.3.5"
Expand Down
104 changes: 61 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,55 +1,67 @@
GEM
remote: http://rubygems.org/
specs:
addressable (2.3.5)
addressable (2.4.0)
archive-tar-minitar (0.5.2)
builder (3.2.2)
builder (3.2.3)
columnize (0.3.4)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
git (1.2.6)
github_api (0.4.10)
faraday (~> 0.7.6)
hashie (~> 1.2.0)
multi_json (~> 1.0)
oauth2 (~> 0.5.2)
hashie (1.2.0)
highline (1.6.20)
jeweler (2.0.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
git (1.5.0)
github_api (0.16.0)
addressable (~> 2.4.0)
descendants_tracker (~> 0.0.4)
faraday (~> 0.8, < 0.10)
hashie (>= 3.4)
mime-types (>= 1.16, < 3.0)
oauth2 (~> 1.0)
hashie (3.6.0)
highline (2.0.0)
jeweler (2.3.9)
builder
bundler (>= 1.0)
bundler
git (>= 1.2.5)
github_api
github_api (~> 0.16.0)
highline (>= 1.6.15)
nokogiri (>= 1.5.10)
psych
rake
rdoc
json (1.8.1)
semver2
jwt (2.1.0)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mini_portile (0.5.2)
mime-types (2.99.3)
mini_portile2 (2.3.0)
minitest (2.8.0)
multi_json (1.0.3)
multipart-post (1.2.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
rack (1.3.5)
rack-protection (1.1.4)
mono_logger (1.1.0)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustermann (1.0.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
psych (3.0.3)
rack (2.0.6)
rack-protection (2.0.4)
rack
rake (10.1.1)
rdoc (4.1.1)
json (~> 1.4)
redis (2.2.2)
redis-namespace (1.0.3)
redis (< 3.0.0)
resque (1.19.0)
rake (12.3.1)
rdoc (6.0.4)
redis (4.0.3)
redis-namespace (1.6.0)
redis (>= 3.0.4)
resque (2.0.0)
mono_logger (~> 1.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0.2)
redis-namespace (~> 1.6)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
ruby-debug-base19 (0.11.25)
Expand All @@ -62,12 +74,15 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
tilt (~> 1.3, >= 1.3.3)
tilt (1.3.3)
vegas (0.1.8)
semver2 (3.4.2)
sinatra (2.0.4)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.4)
tilt (~> 2.0)
thread_safe (0.3.6)
tilt (2.0.8)
vegas (0.1.11)
rack (>= 1.0.0)

PLATFORMS
Expand All @@ -77,5 +92,8 @@ DEPENDENCIES
bundler
jeweler
minitest (>= 2)
resque (~> 1.19)
resque
ruby-debug19

BUNDLED WITH
1.16.6
6 changes: 3 additions & 3 deletions lib/resque/metrics/backends/statsd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def increment_metric(metric, by = 1)
when 'time'
statsd.timing key, by
when 'count'
statsd.increment key, by
statsd.count key, by
else
raise "Not sure how to increment_metric for a #{time_or_count} metric (#{metric})"
end
Expand All @@ -42,7 +42,7 @@ def increment_metric(metric, by = 1)
else
"#{metric_prefix}.payload_size.#{time_or_count}"
end
statsd.increment key, by
statsd.count key, by
else
raise "Not sure how to increment_metric #{metric}"
end
Expand All @@ -56,7 +56,7 @@ def set_metric(metric, val)
raise "Not sure how to set_metric #{metric}"
end
end

# set_avg: let statsd & graphite handle that
# get_metric: would have to talk to graphite. but man, complicated
end
Expand Down