ext_batch 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928edb3de02a2eab0172f7e0427f81dd2711a5fe
-  data.tar.gz: 716503cde0c20d4edf5efc84c0da4faba0ff2789
+  metadata.gz: 4ca7d0e5cb121d2905805aed2f0eec87e5578eb1
+  data.tar.gz: 7b6d7c5668add86a6a99fbafa2e7de3fd588843a
 SHA512:
-  metadata.gz: 83f180c3186d891bc13506de6282e7ad35c5767d8fcbd10074fee3535e566425ded05b1662cecbd17f2db92ba4610395460b0a0c82837d39007e81c8899553c2
-  data.tar.gz: 2c950e059c8e3a50d5a68163e6b80fea7ae3a1fc1a183b623a3bea63b861836ed9ae0352c7e8079145f20c250e709e4d806001063c1e84e1509737b454d7c441
+  metadata.gz: a469e9628fc50be1771f28d5d0ef8a15d889397b0d612982431654c7e9265fded3e5f57ad9266bf2aa184d12a4e9aba2978cbfca0bd737d1e3a61ac01838d374
+  data.tar.gz: 189486a5d7aaaee0a3351dedc7409148f6e9ed05e741582567a74775e165e3f9f88f77c0da5661bf1b8614386dd4bb75b2aaf027dc5132eeb0f656a694cf39de

data/README.md

@@ -5,9 +5,9 @@ Welcome to your new gem! In this directory, you'll find the files you need to be
 ```explain
 Extended the ext_logger gem package, services for Ruby batch and Ruby rake. 
 Other extensions see version updates.
-2019-01-20(0.1.3):
+2019-01-20(0.1.4):
     dependency: ext_logger ~> v0.2
-    
+    Add configuration for batch mail.
 
 ```
 
@@ -15,9 +15,7 @@ Other extensions see version updates.
 
 Add this line to your application's Gemfile:
 
-```ruby
-gem 'ext_batch'
-```
+    gem 'ext_batch'
 
 And then execute:
 
@@ -26,6 +24,23 @@ And then execute:
 Or install it yourself as:
 
     $ gem install ext_batch
+    
+## Configure
+
+Mail configuration, add the following configuration to the Application Mailer file.
+```ruby
+  # add to application_mailer.rb
+  def send_batch_mail(to, title, body)
+    mail_hash = {
+        to: to,
+        subject: title,
+        body: body,
+        content_type: 'text/html',
+    }
+
+    mail(mail_hash)
+  end
+```
 
 ## Usage
 
@@ -68,6 +83,28 @@ Or install it yourself as:
     batch.end
 ```
 
+## Example:
+
+```ruby
+    # In rake batch_name = task
+    # In ruby file batch_name = File.basename(__FILE__).gsub('.rb', '')
+    # In method batch_name = __method__
+    
+    batch = ExtBatch.new(batch_name)
+    begin
+      batch.info 'info message'
+      batch.error 'error message'
+      ...
+      
+      batch.mail_ok({to: 'mailname@maildomain.com', content: 'mail content.'})
+      batch.mail_ok({to: 'mailname@maildomain.com', content: 'mail content.'})
+      ...
+    rescue Exception => e
+      batch.exception(e, {send_mail: true/false})
+    end
+    batch.end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ext_batch/main.rb

@@ -190,10 +190,7 @@ class ExtBatch
     content << analysis_exception(e)
     content << opt[:content] if !is_blank?(opt[:content])
 
-    case opt[:send_mail]
-      when SEND_MAIL_YES
-        mail_error({content: content.join("\n")})
-    end
+    mail_error({content: content.join("\n")}) if opt[:send_mail] == SEND_MAIL_YES
     error(content)
   end
 
@@ -323,6 +320,8 @@ class ExtBatch
   # batch: send tips mail
   def mail_tips(task_name, opt={})
     func_name = "[#{get_class_name}:private #{__method__.to_s}]"
+    opt[:from] ||= ''
+    opt[:to] ||= ''
     opt[:content] ||= ''
     _status = opt[:status] || LABEL_OK
 
@@ -337,16 +336,16 @@ class ExtBatch
     message_body = result.join("\n")
     # info message_body
 
-    _option = {
+    mail_option = {
+        to:     opt[:to],
         title:  "BATCH #{_status}: #{task_name} (#{Time.now})",
-        body:   result.collect{|t| t.gsub('\n', '<br />')}.join("<br />"),
+        body:   message_body.gsub("\n", "<br />"),
         status: _status
     }
 
-    _option =   _option.merge({body: message_body})
     message =   "### Next is detail of mail ###\n"
-    message +=  "[TITLE]: #{_option[:title]}\n"
-    message +=  "[BODY]:\n #{_option[:body]}\n"
+    message +=  "[TITLE]: #{mail_option[:title]}\n"
+    message +=  "[BODY]:\n #{message_body}\n"
 
     case _status
       when LABEL_ERROR
@@ -361,24 +360,30 @@ class ExtBatch
 
     if defined? ActionMailer
       mail_flag = true
-      if is_blank?(opt[:to]) && is_blank?(opt[:from]) && is_blank?(opt[:title]) && is_blank?(opt[:body])
+      if is_blank?(opt[:to]) && is_blank?(opt[:content])
         @ext_logger.error "#{func_name} Mail delivery failed, parameters error. opt: #{opt}"
         mail_flag = false
       end
 
       if mail_flag
-        mail_option = {
-            to: opt[:to],
-            subject: opt[:title],
-            content_type: 'text/html'
-        }
-        # logger.info "set_mail", mail_hash
-        mail_option = mail_option.merge(:from => opt[:from]) if !opt[:from].empty?
-        mail_option = mail_option.merge(:body => opt[:body]) if !opt[:body].empty?
-        mail_option = mail_option.merge(:template_path => opt[:template_path]) if !opt[:template_path].empty?
-        mail_option = mail_option.merge(:template_name => opt[:template_name]) if !opt[:template_name].empty?
-
-        mail(mail_option)
+        # mail_option = {
+        #     from: opt[:from],
+        #     to: opt[:to],
+        #     content_type: 'text/html',
+        #     subject: _option[:title],
+        #     body: _option[:body]
+        # }
+        # # logger.info "set_mail", mail_hash
+        # mail_option = mail_option.merge(:template_path => opt[:template_path]) if !is_blank?(opt[:template_path])
+        # mail_option = mail_option.merge(:template_name => opt[:template_name]) if !is_blank?(opt[:template_name])
+        # mail(mail_option)
+
+        begin
+          ApplicationMailer.send_batch_mail(mail_option[:to], mail_option[:title], mail_option[:body]).deliver
+          @ext_logger.info "Batch mail send OK."
+        rescue Exception => e
+          @ext_logger.exception e
+        end
       end
     else
       @ext_logger.warn "#{func_name} Mail delivery failed, not found ActionMailer class."

data/lib/ext_batch/version.rb

@@ -1,3 +1,3 @@
 module ExtBatch
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/templates/app/mailers/application_mailer.rb

@@ -0,0 +1,15 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+
+  def send_batch_mail(to, title, body)
+    mail_hash = {
+        to: to,
+        subject: title,
+        body: body,
+        content_type: 'text/html',
+    }
+
+    mail(mail_hash)
+  end
+end

data/lib/templates/config/initializers/sidekiq.rb

@@ -0,0 +1,18 @@
+if Rails.env.production?
+  redis_server = '127.0.0.1'
+elsif Rails.env.staging?
+  redis_server = '127.0.0.1'
+else
+  redis_server = '127.0.0.1'
+end
+
+redis_port = 6379
+redis_db_num = 1
+redis_namespace = 'batch_monitor'
+
+Sidekiq.configure_server do |config|
+  config.redis = { url: "redis://#{redis_server}:#{redis_port}/#{redis_db_num}", namespace: redis_namespace }
+  config.on(:startup) do
+    Sidekiq::Scheduler.reload_schedule!
+  end
+end

data/lib/templates/config/sidekiq.yml

@@ -0,0 +1,26 @@
+:concurrency: 5
+:pidfile: tmp/pids/sidekiq.pid
+:logfile: ./log/sidekiq.log
+:timeout: 10
+:queues:
+- default # 写在队列参数中的, 表示让 sidekiq 处理这个 queue
+- [batch_monitor, 5] # 使用数组的形式写, 第一个参数为打开的 queue 的名称, 第二个为优先级
+
+sidekiq_schedule: &run_work
+# 配置worker
+:schedule:
+  ext_batch_monitor:
+    every: '4s'
+    class: ExtBatchMonitor
+development:
+  <<: *run_work
+  :concurrency: 20
+stage:
+  <<: *run_work
+  :concurrency: 30
+production:
+  <<: *run_work
+  :concurrency: 40
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ext_batch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ruby
@@ -104,6 +104,9 @@ files:
 - lib/ext_batch/main.rb
 - lib/ext_batch/version.rb
 - lib/tasks/ext_batch.rake
+- lib/templates/app/mailers/application_mailer.rb
+- lib/templates/config/initializers/sidekiq.rb
+- lib/templates/config/sidekiq.yml
 - lib/templates/workers/ext_batch_monitor.rb
 homepage: ''
 licenses: