From e2a239572e471a3212730bce1a21d48f13f3e2c9 Mon Sep 17 00:00:00 2001 From: ocha Date: Mon, 16 May 2016 23:18:54 +0900 Subject: [PATCH] =?UTF-8?q?MailSender:=20=E3=83=9C=E3=83=83=E3=83=88?= =?UTF-8?q?=E3=81=AE=E3=83=AD=E3=82=AC=E3=83=BC=E3=82=92=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs #67 --- lib/rgrb/plugin/server_connection_report/generator.rb | 3 ++- lib/rgrb/plugin/server_connection_report/mail_sender.rb | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/rgrb/plugin/server_connection_report/generator.rb b/lib/rgrb/plugin/server_connection_report/generator.rb index 94ac5f20..73017c2a 100644 --- a/lib/rgrb/plugin/server_connection_report/generator.rb +++ b/lib/rgrb/plugin/server_connection_report/generator.rb @@ -16,7 +16,8 @@ class Generator def configure(config_data) super - @mail = MailSender.new(config_data['Mail'] || {}) + @mail = MailSender.new(config_data['Mail'] || {}, + config_data[:logger]) @mail.load_message_template("#{@data_path}/#{config_data['MessageTemplate']}.txt") self diff --git a/lib/rgrb/plugin/server_connection_report/mail_sender.rb b/lib/rgrb/plugin/server_connection_report/mail_sender.rb index 50828a3c..c2192e71 100644 --- a/lib/rgrb/plugin/server_connection_report/mail_sender.rb +++ b/lib/rgrb/plugin/server_connection_report/mail_sender.rb @@ -10,10 +10,11 @@ module ServerConnectionReport # メール送信を司るクラス class MailSender # 送信データを初期化する - # @param [Hash] config + # @param [Hash] config 設定 + # @param [Object] logger ロガー # @option [String] to 送信先 # @option [Hash] smtp 送信に利用するSMTPサーバーの設定 - def initialize(config) + def initialize(config, logger = nil) if(config['SMTP']) @mail_config = symbolize_keys(config['SMTP']) .delete_if do |key, value| @@ -22,7 +23,7 @@ def initialize(config) end @to = config['To'] || 'root@localhost' - @logger = Lumberjack::Logger.new( + @logger = logger || Lumberjack::Logger.new( $stdout, progname: self.class.to_s ) end