sidekiq_publisher 2.4.0 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +1 -1
- data/.github/workflows/ci.yml +75 -0
- data/.github/workflows/codeql.yml +71 -0
- data/.github/workflows/dependency-review.yml +15 -0
- data/Appraisals +0 -92
- data/CHANGELOG.md +8 -1
- data/LICENSE.txt +1 -1
- data/README.md +6 -3
- data/gemfiles/{rails_5.2_sidekiq_5.0.gemfile → rails_6.1_sidekiq_6.3.gemfile} +3 -3
- data/lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb +16 -3
- data/lib/sidekiq_publisher/database_connection.rb +9 -0
- data/lib/sidekiq_publisher/datadog_apm.rb +1 -1
- data/lib/sidekiq_publisher/publisher.rb +4 -4
- data/lib/sidekiq_publisher/version.rb +1 -1
- data/lib/sidekiq_publisher/worker.rb +5 -1
- data/lib/sidekiq_publisher.rb +1 -0
- data/sidekiq_publisher.gemspec +3 -3
- metadata +22 -26
- data/.codeclimate.yml +0 -53
- data/Dockerfile +0 -4
- data/docker-compose.yml +0 -45
- data/gemfiles/rails_5.2.gemfile +0 -8
- data/gemfiles/rails_5.2_sidekiq_5.1.gemfile +0 -9
- data/gemfiles/rails_5.2_sidekiq_5.2.gemfile +0 -9
- data/gemfiles/rails_5.2_sidekiq_6.0.gemfile +0 -9
- data/gemfiles/rails_5.2_sidekiq_6.1.gemfile +0 -9
- data/gemfiles/rails_5.2_sidekiq_6.2.gemfile +0 -9
- data/gemfiles/rails_6.0_sidekiq_5.2.gemfile +0 -9
- data/gemfiles/rails_6.0_sidekiq_6.0.gemfile +0 -9
- data/gemfiles/rails_6.0_sidekiq_6.1.gemfile +0 -9
- data/gemfiles/rails_6.0_sidekiq_6.2.gemfile +0 -9
- data/gemfiles/rails_6.0_sidekiq_6.4.gemfile +0 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 86345d364ea857b29f80ee4f041dd6837c29e5b5a05111497029d461c31d3e7e
|
|
4
|
+
data.tar.gz: 32e159819ce58399eab3cd541e99025f0919cee3e0ccd13a54982638769a6857
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3a046f7e8a4b39d36215d4676d4467877492cdb26e12cddf5a07a3ff2a52ae78e384657487471a0f0f8443e88cba80583fe53e04914614ef622af8a5b43dfd1e
|
|
7
|
+
data.tar.gz: c75cd6ec9e1d2af0c745da843b962c6eedf47868451e26b6ddddce438043438f44ec25ed023352bf05580a8266487d9d584421108658218b69ba2751a7664a89
|
data/.github/CODEOWNERS
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
* @ezcater/demand-
|
|
1
|
+
* @ezcater/demand-scalability
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
name: CI
|
|
2
|
+
on:
|
|
3
|
+
push:
|
|
4
|
+
branches: [ main ]
|
|
5
|
+
pull_request:
|
|
6
|
+
|
|
7
|
+
env:
|
|
8
|
+
app: sidekiq_publisher
|
|
9
|
+
|
|
10
|
+
jobs:
|
|
11
|
+
lint:
|
|
12
|
+
name: Lint (Ruby ${{ matrix.ruby }})
|
|
13
|
+
runs-on: ubuntu-latest
|
|
14
|
+
strategy:
|
|
15
|
+
fail-fast: false
|
|
16
|
+
matrix:
|
|
17
|
+
ruby: [ '3.0', '3.1', '3.2' ]
|
|
18
|
+
|
|
19
|
+
steps:
|
|
20
|
+
- name: Checkout the code
|
|
21
|
+
uses: actions/checkout@v3
|
|
22
|
+
|
|
23
|
+
- name: Install Ruby ${{ matrix.ruby }}
|
|
24
|
+
uses: ruby/setup-ruby@v1
|
|
25
|
+
with:
|
|
26
|
+
ruby-version: ${{ matrix.ruby }}
|
|
27
|
+
bundler-cache: true
|
|
28
|
+
|
|
29
|
+
- name: Run Rubocop
|
|
30
|
+
run: bundle exec rubocop
|
|
31
|
+
|
|
32
|
+
test:
|
|
33
|
+
name: Test (Ruby ${{ matrix.ruby }})
|
|
34
|
+
runs-on: ubuntu-latest
|
|
35
|
+
strategy:
|
|
36
|
+
fail-fast: false
|
|
37
|
+
matrix:
|
|
38
|
+
ruby: [ '3.0', '3.1', '3.2' ]
|
|
39
|
+
|
|
40
|
+
env:
|
|
41
|
+
DATABASE_URL: postgres://postgres:postgres@localhost:5432/sidekiq_publisher_test
|
|
42
|
+
PGHOST: 127.0.0.1
|
|
43
|
+
PGUSER: postgres
|
|
44
|
+
REDIS_URL: redis://localhost:6379
|
|
45
|
+
RAILS_ENV: test
|
|
46
|
+
|
|
47
|
+
services:
|
|
48
|
+
postgres:
|
|
49
|
+
image: postgres:latest
|
|
50
|
+
env:
|
|
51
|
+
POSTGRES_USER: "postgres"
|
|
52
|
+
POSTGRES_PASSWORD: "postgres"
|
|
53
|
+
POSTGRES_DB: sidekiq_publisher_test
|
|
54
|
+
POSTGRES_HOST_AUTH_METHOD: trust
|
|
55
|
+
ports:
|
|
56
|
+
- 5432:5432
|
|
57
|
+
redis:
|
|
58
|
+
image: redis:latest
|
|
59
|
+
ports:
|
|
60
|
+
- 6379:6379
|
|
61
|
+
|
|
62
|
+
steps:
|
|
63
|
+
- name: Checkout the code
|
|
64
|
+
uses: actions/checkout@v3
|
|
65
|
+
|
|
66
|
+
- name: Install Ruby
|
|
67
|
+
uses: ruby/setup-ruby@v1
|
|
68
|
+
with:
|
|
69
|
+
ruby-version: ${{ matrix.ruby }}
|
|
70
|
+
bundler-cache: true
|
|
71
|
+
|
|
72
|
+
- name: Run Rspec
|
|
73
|
+
run: |
|
|
74
|
+
bundle exec appraisal install
|
|
75
|
+
bundle exec appraisal rspec
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
name: "CodeQL"
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
push:
|
|
5
|
+
branches: [ "main" ]
|
|
6
|
+
pull_request:
|
|
7
|
+
# The branches below must be a subset of the branches above
|
|
8
|
+
branches: [ "main" ]
|
|
9
|
+
# https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning#avoiding-unnecessary-scans-of-pull-requests
|
|
10
|
+
paths-ignore:
|
|
11
|
+
- '**/*.md'
|
|
12
|
+
- '**/*.txt'
|
|
13
|
+
schedule:
|
|
14
|
+
- cron: '41 22 * * 5'
|
|
15
|
+
|
|
16
|
+
jobs:
|
|
17
|
+
scan:
|
|
18
|
+
name: Scan
|
|
19
|
+
runs-on: [ ubuntu-latest ]
|
|
20
|
+
permissions:
|
|
21
|
+
actions: read
|
|
22
|
+
contents: read
|
|
23
|
+
security-events: write
|
|
24
|
+
|
|
25
|
+
strategy:
|
|
26
|
+
# Setting fail-fast to false to prevent a failed scan in
|
|
27
|
+
# any of the matrix.language's from stopping the other scans
|
|
28
|
+
# If there are multiple offenses, better to find/report them
|
|
29
|
+
# all at once
|
|
30
|
+
fail-fast: false
|
|
31
|
+
matrix:
|
|
32
|
+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
|
33
|
+
# https://aka.ms/codeql-docs/language-support
|
|
34
|
+
language: [ 'ruby' ]
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
steps:
|
|
38
|
+
- name: Checkout repository
|
|
39
|
+
uses: actions/checkout@v3
|
|
40
|
+
|
|
41
|
+
# Initializes the CodeQL tools for scanning.
|
|
42
|
+
- name: Initialize CodeQL
|
|
43
|
+
uses: github/codeql-action/init@v2
|
|
44
|
+
with:
|
|
45
|
+
languages: ${{ matrix.language }}
|
|
46
|
+
# If you wish to specify custom queries, you can do so here or in a config file.
|
|
47
|
+
# By default, queries listed here will override any specified in a config file.
|
|
48
|
+
# Prefix the list here with "+" to use these queries and those in the config file.
|
|
49
|
+
|
|
50
|
+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
|
|
51
|
+
# queries: security-extended,security-and-quality
|
|
52
|
+
|
|
53
|
+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
|
|
54
|
+
# If this step fails, then you should remove it and run the build manually (see below)
|
|
55
|
+
- name: Autobuild
|
|
56
|
+
uses: github/codeql-action/autobuild@v2
|
|
57
|
+
|
|
58
|
+
# ℹ️ Command-line programs to run using the OS shell.
|
|
59
|
+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
|
|
60
|
+
|
|
61
|
+
# If the Autobuild fails above, remove it and uncomment the following three lines.
|
|
62
|
+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
|
|
63
|
+
|
|
64
|
+
# - run: |
|
|
65
|
+
# echo "Run, Build Application using script"
|
|
66
|
+
# ./location_of_script_within_repo/buildscript.sh
|
|
67
|
+
|
|
68
|
+
- name: Perform CodeQL Analysis
|
|
69
|
+
uses: github/codeql-action/analyze@v2
|
|
70
|
+
with:
|
|
71
|
+
category: "/language:${{matrix.language}}"
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
name: 'Dependency Review'
|
|
2
|
+
on: [pull_request]
|
|
3
|
+
permissions:
|
|
4
|
+
contents: read
|
|
5
|
+
jobs:
|
|
6
|
+
dependency-review:
|
|
7
|
+
runs-on: ubuntu-latest
|
|
8
|
+
steps:
|
|
9
|
+
- name: 'Checkout Repository'
|
|
10
|
+
uses: actions/checkout@v3
|
|
11
|
+
- name: Dependency Review
|
|
12
|
+
uses: actions/dependency-review-action@v3
|
|
13
|
+
with:
|
|
14
|
+
# Possible values: "critical", "high", "moderate", "low"
|
|
15
|
+
fail-on-severity: high
|
data/Appraisals
CHANGED
|
@@ -1,83 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
appraise "rails-5.2-sidekiq-5.0" do
|
|
4
|
-
gem "activejob", "~> 5.2.0"
|
|
5
|
-
gem "activesupport", "~> 5.2.0"
|
|
6
|
-
gem "sidekiq", "~> 5.0.4"
|
|
7
|
-
end
|
|
8
|
-
|
|
9
|
-
appraise "rails-5.2-sidekiq-5.1" do
|
|
10
|
-
gem "activejob", "~> 5.2.0"
|
|
11
|
-
gem "activesupport", "~> 5.2.0"
|
|
12
|
-
gem "sidekiq", "~> 5.1.0"
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
appraise "rails-5.2-sidekiq-5.2" do
|
|
16
|
-
gem "activejob", "~> 5.2.0"
|
|
17
|
-
gem "activesupport", "~> 5.2.0"
|
|
18
|
-
gem "sidekiq", "~> 5.2.0"
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
appraise "rails-5.2-sidekiq-6.0" do
|
|
22
|
-
gem "activejob", "~> 5.2.0"
|
|
23
|
-
gem "activesupport", "~> 5.2.0"
|
|
24
|
-
gem "sidekiq", "~> 6.0.1"
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
appraise "rails-5.2-sidekiq-6.1" do
|
|
28
|
-
gem "activejob", "~> 5.2.0"
|
|
29
|
-
gem "activesupport", "~> 5.2.0"
|
|
30
|
-
gem "sidekiq", "~> 6.1.0"
|
|
31
|
-
end
|
|
32
|
-
|
|
33
|
-
appraise "rails-5.2-sidekiq-6.2" do
|
|
34
|
-
gem "activejob", "~> 5.2.0"
|
|
35
|
-
gem "activesupport", "~> 5.2.0"
|
|
36
|
-
gem "sidekiq", "~> 6.2.0"
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
appraise "rails-5.2-sidekiq-6.3" do
|
|
40
|
-
gem "activejob", "~> 5.2.0"
|
|
41
|
-
gem "activesupport", "~> 5.2.0"
|
|
42
|
-
gem "sidekiq", "~> 6.3.0"
|
|
43
|
-
end
|
|
44
|
-
|
|
45
|
-
appraise "rails-6.0-sidekiq-5.2" do
|
|
46
|
-
gem "activejob", "~> 6.0.0"
|
|
47
|
-
gem "activesupport", "~> 6.0.0"
|
|
48
|
-
gem "sidekiq", "~> 5.2.0"
|
|
49
|
-
end
|
|
50
|
-
|
|
51
|
-
appraise "rails-6.0-sidekiq-6.0" do
|
|
52
|
-
gem "activejob", "~> 6.0.0"
|
|
53
|
-
gem "activesupport", "~> 6.0.0"
|
|
54
|
-
gem "sidekiq", "~> 6.0.1"
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
appraise "rails-6.0-sidekiq-6.1" do
|
|
58
|
-
gem "activejob", "~> 6.0.0"
|
|
59
|
-
gem "activesupport", "~> 6.0.0"
|
|
60
|
-
gem "sidekiq", "~> 6.1.0"
|
|
61
|
-
end
|
|
62
|
-
|
|
63
|
-
appraise "rails-6.0-sidekiq-6.2" do
|
|
64
|
-
gem "activejob", "~> 6.0.0"
|
|
65
|
-
gem "activesupport", "~> 6.0.0"
|
|
66
|
-
gem "sidekiq", "~> 6.2.0"
|
|
67
|
-
end
|
|
68
|
-
|
|
69
|
-
appraise "rails-6.0-sidekiq-6.3" do
|
|
70
|
-
gem "activejob", "~> 6.0.0"
|
|
71
|
-
gem "activesupport", "~> 6.0.0"
|
|
72
|
-
gem "sidekiq", "~> 6.3.0"
|
|
73
|
-
end
|
|
74
|
-
|
|
75
|
-
appraise "rails-6.0-sidekiq-6.4" do
|
|
76
|
-
gem "activejob", "~> 6.0.0"
|
|
77
|
-
gem "activesupport", "~> 6.0.0"
|
|
78
|
-
gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
|
|
79
|
-
end
|
|
80
|
-
|
|
81
3
|
appraise "rails-6.1-sidekiq-5.2" do
|
|
82
4
|
gem "activejob", "~> 6.1.0"
|
|
83
5
|
gem "activesupport", "~> 6.1.0"
|
|
@@ -113,17 +35,3 @@ appraise "rails-6.1-sidekiq-6.4" do
|
|
|
113
35
|
gem "activesupport", "~> 6.1.0"
|
|
114
36
|
gem "sidekiq", "~> 6.4.2" # above 6.4.2 to ensure we test against breaking changes
|
|
115
37
|
end
|
|
116
|
-
|
|
117
|
-
appraise "rails-6.1-sidekiq-6.4-ddtrace-0-x" do
|
|
118
|
-
gem "activejob", "~> 6.1.0"
|
|
119
|
-
gem "activesupport", "~> 6.1.0"
|
|
120
|
-
gem "sidekiq", "~> 6.4.2"
|
|
121
|
-
gem "ddtrace", "~> 0.54"
|
|
122
|
-
end
|
|
123
|
-
|
|
124
|
-
appraise "rails-6.1-sidekiq-6.4-ddtrace-0-x" do
|
|
125
|
-
gem "activejob", "~> 6.1.0"
|
|
126
|
-
gem "activesupport", "~> 6.1.0"
|
|
127
|
-
gem "sidekiq", "~> 6.4.2"
|
|
128
|
-
gem "ddtrace", "~> 1.0"
|
|
129
|
-
end
|
data/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
# sidekiq_publisher
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## 4.0.0
|
|
4
|
+
- BREAKING: Enqueue directly to Redis unless in a transaction ([#74](https://github.com/ezcater/sidekiq_publisher/pull/74/))
|
|
5
|
+
|
|
6
|
+
## 3.0.0
|
|
7
|
+
- BREAKING: Drop support for Ruby `2.6` and `2.7` as they are [past end of life](https://endoflife.date/ruby)
|
|
8
|
+
- BREAKING: Drop support for `ddtrace <= 1.8.0`
|
|
9
|
+
- BREAKING: Drop support for Redis `5.x`
|
|
10
|
+
- (internal) Move CI to Github workflows
|
|
4
11
|
|
|
5
12
|
## 2.4.0
|
|
6
13
|
- Update active_support dependency to allow any active_support 7.x.x version
|
data/LICENSE.txt
CHANGED
data/README.md
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
# sidekiq_publisher
|
|
2
2
|
|
|
3
|
-
[![Gem Version][gem_badge]][gem_link]
|
|
3
|
+
[![Gem Version][gem_badge]][gem_link]
|
|
4
4
|
|
|
5
|
-
[circle_badge]: https://circleci.com/gh/ezcater/sidekiq_publisher.svg?style=svg
|
|
6
|
-
[circle_link]: https://circleci.com/gh/ezcater/sidekiq_publisher
|
|
7
5
|
[gem_badge]: https://badge.fury.io/rb/sidekiq_publisher.svg
|
|
8
6
|
[gem_link]: https://badge.fury.io/rb/sidekiq_publisher
|
|
9
7
|
|
|
@@ -18,6 +16,11 @@ that modifies the system of record for the application. It also allows jobs to
|
|
|
18
16
|
be created even when Sidekiq/Redis is temporarily unavailable. The separate
|
|
19
17
|
publisher process handles retries and ensure that each job is delivered to Sidekiq.
|
|
20
18
|
|
|
19
|
+
> :warning: Not all jobs are staged in Postgres. This is determined dynamically:
|
|
20
|
+
> if the job is enqueued from within an `ActiveRecord` transaction, then it is
|
|
21
|
+
> staged in Postgres. If not, then it bypasses Postgres and is enqueued directly
|
|
22
|
+
> to Redis via Sidekiq.
|
|
23
|
+
|
|
21
24
|
## Installation
|
|
22
25
|
|
|
23
26
|
Add this line to your application's Gemfile:
|
|
@@ -11,19 +11,28 @@ module ActiveJob
|
|
|
11
11
|
JOB_WRAPPER_CLASS = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper.to_s.freeze
|
|
12
12
|
|
|
13
13
|
def enqueue(job)
|
|
14
|
-
|
|
14
|
+
if SidekiqPublisher::DatabaseConnection.transaction_open?
|
|
15
|
+
create_job_record(job)
|
|
16
|
+
else
|
|
17
|
+
sidekiq_adapter.enqueue(job)
|
|
18
|
+
end
|
|
15
19
|
end
|
|
16
20
|
|
|
17
21
|
def enqueue_at(job, timestamp)
|
|
18
|
-
|
|
22
|
+
if SidekiqPublisher::DatabaseConnection.transaction_open?
|
|
23
|
+
create_job_record(job, timestamp)
|
|
24
|
+
else
|
|
25
|
+
sidekiq_adapter.enqueue_at(job, timestamp)
|
|
26
|
+
end
|
|
19
27
|
end
|
|
20
28
|
|
|
21
29
|
private
|
|
22
30
|
|
|
23
|
-
def
|
|
31
|
+
def create_job_record(job, timestamp = nil)
|
|
24
32
|
job.provider_job_id = SidekiqPublisher::Job.generate_sidekiq_jid
|
|
25
33
|
attributes = job_attributes(job)
|
|
26
34
|
attributes[:run_at] = timestamp if timestamp.present?
|
|
35
|
+
|
|
27
36
|
SidekiqPublisher::Job.create!(attributes).job_id
|
|
28
37
|
end
|
|
29
38
|
|
|
@@ -36,6 +45,10 @@ module ActiveJob
|
|
|
36
45
|
args: [job.serialize],
|
|
37
46
|
}
|
|
38
47
|
end
|
|
48
|
+
|
|
49
|
+
def sidekiq_adapter
|
|
50
|
+
@_sidekiq_adapter ||= ActiveJob::QueueAdapters::SidekiqAdapter.new
|
|
51
|
+
end
|
|
39
52
|
end
|
|
40
53
|
end
|
|
41
54
|
end
|
|
@@ -32,8 +32,8 @@ module SidekiqPublisher
|
|
|
32
32
|
end
|
|
33
33
|
end
|
|
34
34
|
purge_expired_published_jobs
|
|
35
|
-
rescue StandardError =>
|
|
36
|
-
failure_warning(__method__,
|
|
35
|
+
rescue StandardError => e
|
|
36
|
+
failure_warning(__method__, e)
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
private
|
|
@@ -43,8 +43,8 @@ module SidekiqPublisher
|
|
|
43
43
|
def enqueue_batch(batch, items, notification)
|
|
44
44
|
pushed_count = client.bulk_push(items)
|
|
45
45
|
published_count = update_jobs_as_published!(batch)
|
|
46
|
-
rescue StandardError =>
|
|
47
|
-
failure_warning(__method__,
|
|
46
|
+
rescue StandardError => e
|
|
47
|
+
failure_warning(__method__, e)
|
|
48
48
|
ensure
|
|
49
49
|
published_count = update_jobs_as_published!(batch) if pushed_count.present? && published_count.nil?
|
|
50
50
|
notification[:published_count] = published_count if published_count.present?
|
|
@@ -10,7 +10,11 @@ module SidekiqPublisher
|
|
|
10
10
|
|
|
11
11
|
module ClassMethods
|
|
12
12
|
def client_push(item)
|
|
13
|
-
SidekiqPublisher::
|
|
13
|
+
if SidekiqPublisher::DatabaseConnection.transaction_open?
|
|
14
|
+
SidekiqPublisher::Job.create_job!(item)
|
|
15
|
+
else
|
|
16
|
+
super
|
|
17
|
+
end
|
|
14
18
|
end
|
|
15
19
|
end
|
|
16
20
|
end
|
data/lib/sidekiq_publisher.rb
CHANGED
|
@@ -4,6 +4,7 @@ require "active_support"
|
|
|
4
4
|
require "active_support/core_ext/numeric/time"
|
|
5
5
|
require "sidekiq_publisher/version"
|
|
6
6
|
require "sidekiq_publisher/compatibility"
|
|
7
|
+
require "sidekiq_publisher/database_connection"
|
|
7
8
|
require "sidekiq_publisher/instrumenter"
|
|
8
9
|
require "sidekiq_publisher/metrics_reporter"
|
|
9
10
|
require "sidekiq_publisher/exception_reporter"
|
data/sidekiq_publisher.gemspec
CHANGED
|
@@ -47,9 +47,9 @@ Gem::Specification.new do |spec|
|
|
|
47
47
|
spec.add_development_dependency "appraisal"
|
|
48
48
|
spec.add_development_dependency "bundler"
|
|
49
49
|
spec.add_development_dependency "database_cleaner"
|
|
50
|
-
spec.add_development_dependency "ddtrace", ">=
|
|
50
|
+
spec.add_development_dependency "ddtrace", ">= 1.8.0"
|
|
51
51
|
spec.add_development_dependency "ezcater_matchers"
|
|
52
|
-
spec.add_development_dependency "ezcater_rubocop", "
|
|
52
|
+
spec.add_development_dependency "ezcater_rubocop", ">= 3.0.2", "< 4.0"
|
|
53
53
|
spec.add_development_dependency "factory_bot"
|
|
54
54
|
spec.add_development_dependency "overcommit"
|
|
55
55
|
spec.add_development_dependency "rake"
|
|
@@ -60,6 +60,6 @@ Gem::Specification.new do |spec|
|
|
|
60
60
|
spec.add_development_dependency "simplecov", "< 0.18"
|
|
61
61
|
|
|
62
62
|
spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
|
|
63
|
-
spec.add_runtime_dependency "activesupport", ">=
|
|
63
|
+
spec.add_runtime_dependency "activesupport", ">= 6.1", "< 7.1"
|
|
64
64
|
spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7"
|
|
65
65
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sidekiq_publisher
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 4.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- ezCater, Inc
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2024-02-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activejob
|
|
@@ -72,14 +72,14 @@ dependencies:
|
|
|
72
72
|
requirements:
|
|
73
73
|
- - ">="
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
|
-
version:
|
|
75
|
+
version: 1.8.0
|
|
76
76
|
type: :development
|
|
77
77
|
prerelease: false
|
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
|
79
79
|
requirements:
|
|
80
80
|
- - ">="
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
|
-
version:
|
|
82
|
+
version: 1.8.0
|
|
83
83
|
- !ruby/object:Gem::Dependency
|
|
84
84
|
name: ezcater_matchers
|
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -98,16 +98,22 @@ dependencies:
|
|
|
98
98
|
name: ezcater_rubocop
|
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
|
100
100
|
requirements:
|
|
101
|
-
- -
|
|
101
|
+
- - ">="
|
|
102
|
+
- !ruby/object:Gem::Version
|
|
103
|
+
version: 3.0.2
|
|
104
|
+
- - "<"
|
|
102
105
|
- !ruby/object:Gem::Version
|
|
103
|
-
version:
|
|
106
|
+
version: '4.0'
|
|
104
107
|
type: :development
|
|
105
108
|
prerelease: false
|
|
106
109
|
version_requirements: !ruby/object:Gem::Requirement
|
|
107
110
|
requirements:
|
|
108
|
-
- -
|
|
111
|
+
- - ">="
|
|
112
|
+
- !ruby/object:Gem::Version
|
|
113
|
+
version: 3.0.2
|
|
114
|
+
- - "<"
|
|
109
115
|
- !ruby/object:Gem::Version
|
|
110
|
-
version:
|
|
116
|
+
version: '4.0'
|
|
111
117
|
- !ruby/object:Gem::Dependency
|
|
112
118
|
name: factory_bot
|
|
113
119
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -240,7 +246,7 @@ dependencies:
|
|
|
240
246
|
requirements:
|
|
241
247
|
- - ">="
|
|
242
248
|
- !ruby/object:Gem::Version
|
|
243
|
-
version: '
|
|
249
|
+
version: '6.1'
|
|
244
250
|
- - "<"
|
|
245
251
|
- !ruby/object:Gem::Version
|
|
246
252
|
version: '7.1'
|
|
@@ -250,7 +256,7 @@ dependencies:
|
|
|
250
256
|
requirements:
|
|
251
257
|
- - ">="
|
|
252
258
|
- !ruby/object:Gem::Version
|
|
253
|
-
version: '
|
|
259
|
+
version: '6.1'
|
|
254
260
|
- - "<"
|
|
255
261
|
- !ruby/object:Gem::Version
|
|
256
262
|
version: '7.1'
|
|
@@ -281,32 +287,21 @@ executables: []
|
|
|
281
287
|
extensions: []
|
|
282
288
|
extra_rdoc_files: []
|
|
283
289
|
files:
|
|
284
|
-
- ".codeclimate.yml"
|
|
285
290
|
- ".github/CODEOWNERS"
|
|
291
|
+
- ".github/workflows/ci.yml"
|
|
292
|
+
- ".github/workflows/codeql.yml"
|
|
293
|
+
- ".github/workflows/dependency-review.yml"
|
|
286
294
|
- Appraisals
|
|
287
295
|
- CHANGELOG.md
|
|
288
|
-
- Dockerfile
|
|
289
296
|
- Gemfile
|
|
290
297
|
- LICENSE.txt
|
|
291
298
|
- README.md
|
|
292
299
|
- app/models/sidekiq_publisher/job.rb
|
|
293
|
-
- docker-compose.yml
|
|
294
|
-
- gemfiles/rails_5.2.gemfile
|
|
295
|
-
- gemfiles/rails_5.2_sidekiq_5.0.gemfile
|
|
296
|
-
- gemfiles/rails_5.2_sidekiq_5.1.gemfile
|
|
297
|
-
- gemfiles/rails_5.2_sidekiq_5.2.gemfile
|
|
298
|
-
- gemfiles/rails_5.2_sidekiq_6.0.gemfile
|
|
299
|
-
- gemfiles/rails_5.2_sidekiq_6.1.gemfile
|
|
300
|
-
- gemfiles/rails_5.2_sidekiq_6.2.gemfile
|
|
301
|
-
- gemfiles/rails_6.0_sidekiq_5.2.gemfile
|
|
302
|
-
- gemfiles/rails_6.0_sidekiq_6.0.gemfile
|
|
303
|
-
- gemfiles/rails_6.0_sidekiq_6.1.gemfile
|
|
304
|
-
- gemfiles/rails_6.0_sidekiq_6.2.gemfile
|
|
305
|
-
- gemfiles/rails_6.0_sidekiq_6.4.gemfile
|
|
306
300
|
- gemfiles/rails_6.1_sidekiq_5.2.gemfile
|
|
307
301
|
- gemfiles/rails_6.1_sidekiq_6.0.gemfile
|
|
308
302
|
- gemfiles/rails_6.1_sidekiq_6.1.gemfile
|
|
309
303
|
- gemfiles/rails_6.1_sidekiq_6.2.gemfile
|
|
304
|
+
- gemfiles/rails_6.1_sidekiq_6.3.gemfile
|
|
310
305
|
- gemfiles/rails_6.1_sidekiq_6.4.gemfile
|
|
311
306
|
- lib/active_job/queue_adapters/sidekiq_publisher_adapter.rb
|
|
312
307
|
- lib/generators/sidekiq_publisher/install_generator.rb
|
|
@@ -314,6 +309,7 @@ files:
|
|
|
314
309
|
- lib/sidekiq_publisher.rb
|
|
315
310
|
- lib/sidekiq_publisher/client.rb
|
|
316
311
|
- lib/sidekiq_publisher/compatibility.rb
|
|
312
|
+
- lib/sidekiq_publisher/database_connection.rb
|
|
317
313
|
- lib/sidekiq_publisher/datadog_apm.rb
|
|
318
314
|
- lib/sidekiq_publisher/engine.rb
|
|
319
315
|
- lib/sidekiq_publisher/exception_reporter.rb
|
|
@@ -349,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
349
345
|
- !ruby/object:Gem::Version
|
|
350
346
|
version: '0'
|
|
351
347
|
requirements: []
|
|
352
|
-
rubygems_version: 3.
|
|
348
|
+
rubygems_version: 3.2.33
|
|
353
349
|
signing_key:
|
|
354
350
|
specification_version: 4
|
|
355
351
|
summary: Publisher for enqueuing jobs to Sidekiq
|
data/.codeclimate.yml
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
version: "2"
|
|
2
|
-
checks:
|
|
3
|
-
file-lines:
|
|
4
|
-
enabled: false
|
|
5
|
-
method-lines:
|
|
6
|
-
enabled: false
|
|
7
|
-
plugins:
|
|
8
|
-
csslint:
|
|
9
|
-
enabled: true
|
|
10
|
-
duplication:
|
|
11
|
-
enabled: true
|
|
12
|
-
config:
|
|
13
|
-
languages:
|
|
14
|
-
- ruby
|
|
15
|
-
- javascript
|
|
16
|
-
fixme:
|
|
17
|
-
enabled: true
|
|
18
|
-
exclude_patterns:
|
|
19
|
-
- config/
|
|
20
|
-
- db/
|
|
21
|
-
- script/
|
|
22
|
-
- spec/
|
|
23
|
-
- vendor/
|
|
24
|
-
- "**.jpg"
|
|
25
|
-
- "**.png"
|
|
26
|
-
- "**.gif"
|
|
27
|
-
- "**.svg"
|
|
28
|
-
- "**.scss"
|
|
29
|
-
- "**.md"
|
|
30
|
-
- ".rubocop.yml"
|
|
31
|
-
- "Dockerfile"
|
|
32
|
-
- "Capfile"
|
|
33
|
-
- "README.md"
|
|
34
|
-
- "**.erb"
|
|
35
|
-
- "**.jbuilder"
|
|
36
|
-
- "**.rabl"
|
|
37
|
-
- "**.zip"
|
|
38
|
-
- "**.crt"
|
|
39
|
-
- "**.txt"
|
|
40
|
-
- "**.ico"
|
|
41
|
-
- "**.eot"
|
|
42
|
-
- "**.pdf"
|
|
43
|
-
- "**.html"
|
|
44
|
-
- "**.key"
|
|
45
|
-
- "**.docx"
|
|
46
|
-
- "**.fcgi"
|
|
47
|
-
- "**.xml"
|
|
48
|
-
- "**.pem"
|
|
49
|
-
- "**.csr"
|
|
50
|
-
- "**.org"
|
|
51
|
-
- "**.cgi"
|
|
52
|
-
- "**.ru"
|
|
53
|
-
- "**.pptx"
|
data/Dockerfile
DELETED
data/docker-compose.yml
DELETED
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
version: "3.4"
|
|
2
|
-
volumes:
|
|
3
|
-
bundle-volume:
|
|
4
|
-
shared-volume:
|
|
5
|
-
x-environment: &default-environment
|
|
6
|
-
PRYRC: /usr/src/app/.docker-pryrc
|
|
7
|
-
BUNDLE_IGNORE_CONFIG: 1
|
|
8
|
-
BUNDLE_DISABLE_SHARED_GEMS: "true"
|
|
9
|
-
PGUSER: postgres
|
|
10
|
-
PGPASSWORD: postgres
|
|
11
|
-
PGHOST: sidekiq-publisher-postgres
|
|
12
|
-
PGPORT: 5432
|
|
13
|
-
PGDATABASE: sidekiq_publisher_test
|
|
14
|
-
REDIS_URL: redis://sidekiq-publisher-redis:6379
|
|
15
|
-
x-service: &default-service
|
|
16
|
-
build:
|
|
17
|
-
context: .
|
|
18
|
-
args:
|
|
19
|
-
- BUNDLE_EZCATER__JFROG__IO
|
|
20
|
-
volumes:
|
|
21
|
-
- .:/usr/src/gem
|
|
22
|
-
- bundle-volume:/usr/local/bundle:delegated
|
|
23
|
-
- shared-volume:/usr/src/shared:delegated
|
|
24
|
-
tty: true
|
|
25
|
-
stdin_open: true
|
|
26
|
-
services:
|
|
27
|
-
sidekiq-publisher-redis:
|
|
28
|
-
container_name: sidekiq-publisher-redis_1
|
|
29
|
-
image: redis:5.0.9-alpine
|
|
30
|
-
sidekiq-publisher-postgres:
|
|
31
|
-
container_name: sidekiq-publisher-postgres_1
|
|
32
|
-
image: postgres:12.6
|
|
33
|
-
environment:
|
|
34
|
-
POSTGRES_USER: postgres
|
|
35
|
-
POSTGRES_PASSWORD: postgres
|
|
36
|
-
POSTGRES_DB: sidekiq_publisher_test
|
|
37
|
-
sidekiq-publisher-console:
|
|
38
|
-
<<: *default-service
|
|
39
|
-
container_name: sidekiq-publisher-console_1
|
|
40
|
-
environment:
|
|
41
|
-
<<: *default-environment
|
|
42
|
-
command: bash
|
|
43
|
-
depends_on:
|
|
44
|
-
- sidekiq-publisher-redis
|
|
45
|
-
- sidekiq-publisher-postgres
|
data/gemfiles/rails_5.2.gemfile
DELETED