Merge pull request #2461 from peternlewis/pop3s_polling_period_mins

Add a SiteSetting to control the pop3 polling period.
This commit is contained in:
Neil Lalonde 2014-06-23 10:48:40 -04:00
commit 6aa44fd412
3 changed files with 3 additions and 1 deletions

View File

@ -8,7 +8,7 @@ require_dependency 'email/message_builder'
module Jobs module Jobs
class PollMailbox < Jobs::Scheduled class PollMailbox < Jobs::Scheduled
every 5.minutes every SiteSetting.pop3s_polling_period_mins.minutes
sidekiq_options retry: false sidekiq_options retry: false
include Email::BuildEmailHelper include Email::BuildEmailHelper

View File

@ -854,6 +854,7 @@ en:
pop3s_polling_enabled: "Poll via POP3S for email replies" pop3s_polling_enabled: "Poll via POP3S for email replies"
pop3s_polling_insecure: "Poll using plain text POP3 without SSL" pop3s_polling_insecure: "Poll using plain text POP3 without SSL"
pop3s_polling_period_mins: "The period in minutes between checking the POP3S account for email"
pop3s_polling_port: "The port to poll a POP3S account on" pop3s_polling_port: "The port to poll a POP3S account on"
pop3s_polling_host: "The host to poll for email via POP3S" pop3s_polling_host: "The host to poll for email via POP3S"
pop3s_polling_username: "The username for the POP3S account to poll for email" pop3s_polling_username: "The username for the POP3S account to poll for email"

View File

@ -361,6 +361,7 @@ email:
reply_by_email_address: '' reply_by_email_address: ''
pop3s_polling_enabled: false pop3s_polling_enabled: false
pop3s_polling_insecure: false pop3s_polling_insecure: false
pop3s_polling_period_mins: 5
pop3s_polling_host: '' pop3s_polling_host: ''
pop3s_polling_port: 995 pop3s_polling_port: 995
pop3s_polling_username: '' pop3s_polling_username: ''