eivo-rails-sidekiq 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 18e1a43a717d80f54d5c82776f4ae1f932a2ed47
-  data.tar.gz: 2f6bcf3d020e84b990f8990aece2a88911d7ca36
+SHA256:
+  metadata.gz: e9c5a8a7c8b98d2919617c975143a26fde52dd2c4d6eac0ffb5bdc8fa34d9e8f
+  data.tar.gz: 0207c17f23e5a8c01045a0e458dc67fad739821516ca58bd09cafc61098becc3
 SHA512:
-  metadata.gz: 8e9e9cd29a80a0621e738ce519642b48718ac97c34719fdff71d93a5cf39254aff3a9ac44fc3fc31b4a16eb2957a936ace79bc76e2637c460c17d4586763cb57
-  data.tar.gz: 499772a50621222749c643f4e5f9a9c3ca7aa57c542390f92c4851e8c971f9eb5a9c97215846d9bde86b21c2969392dbeff673b521d7537a289aaae8cb546689
+  metadata.gz: 8e54da8308c0bcfa826dba5bec0c195e524f001951add869ad224b0c585177c731ebb06259c1909f2341a2bc590db6d55f6b35e89e3a6b562c192cd9561f6b34
+  data.tar.gz: 76cb6044d5779166e38adef5f16c6a423cc511feff6e926ff94a7ec65d5a1f1f6f4fb4158817348942ee3b5e77ec17e8896d78a62ba27a863b67cb1a66f524c3

data/config/initializers/sidekiq.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 require 'sidekiq'
-require 'redis-namespace'
 require 'hiredis'
 
 redis_config = {
   url: ENV.fetch('REDIS_URL') { 'redis://localhost:6379/0' },
-  namespace: "#{Rails.application.class.parent_name.parameterize}-#{Rails.env}",
   driver: 'hiredis'
 }
 
@@ -16,6 +14,7 @@ end
 
 Sidekiq.configure_server do |config|
   config.redis = redis_config.dup
+  config.log_formatter = Sidekiq::Logger::Formatters::JSON.new
 end
 
 ActiveJob::Base.queue_adapter = :sidekiq if defined?(ActiveJob)

data/eivo-rails-sidekiq.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = 'eivo-rails-sidekiq'
-  spec.version       = '0.0.2'
+  spec.version       = '0.1.0'
   spec.authors       = ['Jonathan VUKOVICH-TRIBOUHARET']
   spec.email         = ['jonathan@eivo.co']
 
@@ -16,8 +16,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '< 6'
-  spec.add_dependency 'redis-namespace'
+  spec.add_dependency 'sidekiq', '>= 6', '< 7'
   spec.add_dependency 'hiredis'
 
   spec.add_development_dependency 'bundler'

data/lib/generators/eivo/sidekiq/install_generator.rb

@@ -15,41 +15,7 @@ module EIVO
       def create_initializer_file
         copy_file 'config/sidekiq.yml'
         copy_file 'app/jobs/application_job.rb'
-
-        restart_code = <<-'EOF'
-### EIVO Sidekiq begin ###
-
-bundle exec sidekiqctl stop tmp/pids/sidekiq.pid 120
-bundle exec sidekiq -C config/sidekiq.yml
-
-### EIVO Sidekiq end ###
-EOF
-
-        stop_code = <<-'EOF'
-### EIVO Sidekiq begin ###
-
-bundle exec sidekiqctl stop tmp/pids/sidekiq.pid 15
-
-### EIVO Sidekiq end ###
-EOF
-
-        # Remove old code if present
-        regexp = /\n### EIVO Sidekiq begin ###.*### EIVO Sidekiq end ###/m
-        gsub_file 'restart_production.sh', regexp, ''
-        gsub_file 'restart_staging.sh', regexp, ''
-        gsub_file 'stop_production.sh', regexp, ''
-        gsub_file 'stop_staging.sh', regexp, ''
-
-        # Inject new code
-        after = "### EIVO end ###\n"
-        inject_into_file 'restart_production.sh', restart_code, after: after
-        inject_into_file 'restart_staging.sh', restart_code, after: after
-        inject_into_file 'stop_production.sh', stop_code, after: after
-        inject_into_file 'stop_staging.sh', stop_code, after: after
-
         append_to_file 'Procfile', "worker: bundle exec sidekiq -C config/sidekiq.yml\n"
-        append_to_file '.env.example', "SIDEKIQ_THREADS=\"5\"\n"
-        gsub_file '.env.example', /^DB_POOL="(\d+)".*/, 'DB_POOL="\1" # [RAILS_MAX_THREADS, SIDEKIQ_THREADS].max'
       end
 
     end

data/lib/generators/eivo/sidekiq/templates/config/sidekiq.yml

@@ -1,11 +1,3 @@
 :concurrency: <%= ENV.fetch('SIDEKIQ_THREADS') { 5 } %>
-staging:
-  :daemon: true
-  :pidfile: tmp/pids/sidekiq-staging.pid
-  :logfile: log/sidekiq-staging.log
-production:
-  :daemon: true
-  :pidfile: tmp/pids/sidekiq.pid
-  :logfile: log/sidekiq.log
 :queues:
   - default

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: eivo-rails-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jonathan VUKOVICH-TRIBOUHARET
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -119,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: EIVO Rails Sidekiq