-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow timeout configuration per delayed job queue (#3945)
- Loading branch information
Showing
7 changed files
with
35 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,27 @@ | ||
module VCAP::CloudController | ||
class JobTimeoutCalculator | ||
JOBS_WITH_TIMEOUTS = %i[app_usage_events_cleanup blobstore_delete diego_sync].freeze | ||
QUEUES_WITH_TIMEOUT = %w[cc-generic].freeze | ||
|
||
def initialize(config) | ||
@config = config | ||
end | ||
|
||
def calculate(job_name) | ||
specified_timeout(job_name) || config.get(:jobs, :global, :timeout_in_seconds) | ||
def calculate(job_name, queue_name=nil) | ||
job_timeout(job_name) || (queue_name && queue_timeout(queue_name)) || config.get(:jobs, :global, :timeout_in_seconds) | ||
end | ||
|
||
private | ||
|
||
def specified_timeout(job_name) | ||
def job_timeout(job_name) | ||
JOBS_WITH_TIMEOUTS.include?(job_name) && config.get(:jobs, job_name.to_sym, :timeout_in_seconds) | ||
end | ||
|
||
def queue_timeout(queue_name) | ||
queue_symbol = queue_name == 'cc-generic' ? :cc_generic : queue_name.to_sym | ||
QUEUES_WITH_TIMEOUT.include?(queue_name) && config.get(:jobs, :queues, queue_symbol, :timeout_in_seconds) | ||
end | ||
|
||
attr_reader :config | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters