wco_email 0.1.1.19 → 0.1.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5369a647f1f785491071fdd4dee5c1ce2cafbe5189380df090c44acd65039c30
-  data.tar.gz: 6552d3a6fd26b6d012913c12551f13c95e90350e86cad5a6e2d1d4a9625edaa1
+  metadata.gz: b01a6b1ee09a45423d8e527c68a537da87e3878695e10c43be9819927a8f411e
+  data.tar.gz: 2f835a2cb7b02a9d27001df259f5d5f2b18cee6fdc94c3fa46d4cf7ae3247e9d
 SHA512:
-  metadata.gz: 3eef294154e5d93522360d143226b9e5d92ce1180ed3d3f7c9c2547fadca31c6185992784ea69bf2eebe1e19aea507a51915b9beeb20d6d25926327250e29329
-  data.tar.gz: c80d75adc3261eb8acac25fd6af78246c277ed98459342363b7e90fa8743bca9e27f8ad1964387d8a4859a12f03142ba1d9fc9c17ca9d124b948e40ca3dc7349
+  metadata.gz: e0a5f78294c1607b426964299e88ec54eb44e9daf910911b9127903b23fa4a19f368c7b304e1dce5da2c4a6300d59b5369fbb595789440fc0ef03ecb9b12c836
+  data.tar.gz: 2ea4cb7770d4887f8b7f9346d3e225933aa8d099620f97d051b970350064c646394e6208b9a5ac507972dcc2b75648fb003d2eef1624b007a8bd04fe98a4b5bf

data/app/controllers/wco_email/email_filters_controller.rb

@@ -34,7 +34,7 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
   def index
     authorize! :index, WcoEmail::EmailFilter.new
     @email_filter  = WcoEmail::EmailFilter.new
-    @email_filters = WcoEmail::EmailFilter.all.page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME] ).per( current_profile.per_page )
+    @email_filters = WcoEmail::EmailFilter.all # .page( params[WcoEmail::EmailFilter::PAGE_PARAM_NAME] ).per( current_profile.per_page )
   end
 
   def new

data/app/views/wco_email/email_filters/index.haml

@@ -12,7 +12,7 @@
     = render 'form', email_filter: @email_filter
   %hr
 
-  = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
+  -# = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
   %table.bordered.data-table
     %thead
       %tr
@@ -47,5 +47,6 @@
         %td= ef.email_template&.slug
         %td= ef.email_action_template&.slug
         %td= ef.tag&.slug
+  -# = paginate @email_filters, param_name: WcoEmail::EmailFilter::PAGE_PARAM_NAME, views_prefix: 'wco'
 
 

data/lib/tasks/wco_email_tasks.rake

@@ -142,13 +142,15 @@ namespace :wco_email do
   task run_email_actions: :environment do
     while true do
 
-      WcoEmail::EmailAction.active.where({ :perform_at.lte => Time.now }).each do |sch|
+      schs = WcoEmail::EmailAction.active.where({ :perform_at.lte => Time.now })
+      print "run_email_actions[#{schs.length}]"
+      schs.each do |sch|
         sch.send_and_roll
         print '^'
+        sleep 1
       end
 
-      duration = Rails.env.production? ? 15 : 15 # 2 minutes or 15 seconds
-      sleep duration
+      sleep 15
       print '.'
 
     end
@@ -159,6 +161,7 @@ namespace :wco_email do
     while true do
 
       ctxs = WcoEmail::Context.scheduled.notsent
+      print "sending[#{ctxs.length}]"
       ctxs.map do |ctx|
 
         unsub = WcoEmail::Unsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.email_template_id }).first
@@ -180,10 +183,10 @@ namespace :wco_email do
         end
 
         print '^'
+        sleep 1
       end
 
-      duration = Rails.env.production? ? 15 : 15 # 2 minutes or 15 seconds
-      sleep duration
+      sleep 15
       print '.'
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.19
+  version: 0.1.1.21
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -451,7 +451,6 @@ files:
 - config/initializers/assets.rb
 - config/routes.rb
 - config/trash/credentials.yml.enc
-- lib/systemd/system/wco_email_sidekiq.service
 - lib/tasks/bjjcollective/sitemap.rb
 - lib/tasks/db_tasks.rake
 - lib/tasks/direct_mail_tasks.rake

data/lib/systemd/system/wco_email_sidekiq.service

@@ -1,22 +0,0 @@
-[Unit]
-Description=wco_email_rb_sidekiq
-
-[Service]
-Type=simple
-User=root
-WorkingDirectory=/opt/projects/micros_email/current
-ExecStart=/root/.rbenv/shims/bundle exec sidekiq -q wco_email_rb -q wco_email_rb_mailers
-ExecStop=/bin/echo nothing
-Restart=on-failure
-Environment=RAILS_ENV=production
-Environment=RAILS_LOG_TO_STDOUT=true
-
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=wco_email_rb_sidekiq
-
-# StandardOutput=append:/var/log/sidekiq/production.log
-# StandardError=append:/var/log/sidekiq/production.log
-
-[Install]
-WantedBy=multi-user.target