Skip to content

Commit 86a3947

Browse files
authored
Use fork of suo to work around dalli log message (#11880)
suo is a transitive dependency of activejob-traffic_control, but explicitly use instacart's fork here to work around dalli log message nickelser/suo#21 Closes #11755 Co-authored-by: Albert Chae <[email protected]>
1 parent e58783d commit 86a3947

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ gem "redis", "~> 5.4" # for caching, jobs, etc.
1616
gem "sidekiq", "~> 7.3.8" # background jobs
1717
gem "sidekiq-cron", "~> 2.3" # run Sidekiq jobs at scheduled intervals
1818
gem "activejob-traffic_control" # throttle jobs
19+
gem "suo", github: "instacart/suo" # suo is a transitive dependency of activejob-traffic_control
20+
# explicitly use instacart fork here to work around dalli log in upstream https://github.com/nickelser/suo/pull/21
1921

2022
gem "image_processing", "~> 1.2"
2123
gem "mini_magick"

Gemfile.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ GIT
44
specs:
55
yellow_pages (0.4.0)
66

7+
GIT
8+
remote: https://github.com/instacart/suo.git
9+
revision: e93ab4a6b5e19ed0ba915092a1a8fcab6d306258
10+
specs:
11+
suo (0.4.0)
12+
dalli
13+
msgpack
14+
redis
15+
716
GEM
817
remote: https://rubygems.org/
918
specs:
@@ -817,10 +826,6 @@ GEM
817826
stripe (11.7.0)
818827
strong_migrations (1.8.0)
819828
activerecord (>= 5.2)
820-
suo (0.4.0)
821-
dalli
822-
msgpack
823-
redis
824829
terser (1.2.6)
825830
execjs (>= 0.3.0, < 3)
826831
thor (1.4.0)
@@ -1023,6 +1028,7 @@ DEPENDENCIES
10231028
statsd-instrument (~> 3.9)
10241029
stripe (= 11.7.0)
10251030
strong_migrations (~> 1)
1031+
suo!
10261032
terser (~> 1.2)
10271033
turbo-rails (~> 2.0.17)
10281034
twilio-ruby

0 commit comments

Comments
 (0)