Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Commit

Permalink
Handle problem with sleep() not liking ActiveRecord::Duration as a pa…
Browse files Browse the repository at this point in the history
  • Loading branch information
thewoolleyman committed Aug 25, 2009
1 parent 8fc77f8 commit a14d4f3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 6 additions & 2 deletions config/configuration.rb
Expand Up @@ -16,11 +16,11 @@ class << self
attr_accessor :default_polling_interval, :disable_build_now, :email_from,
:dashboard_refresh_interval, :serialize_builds,
:serialized_build_timeout, :git_load_new_changesets_timeout
attr_writer :build_request_checking_interval
attr_reader :dashboard_url

# non-published configuration options (obscure stuff, mostly useful for http://cruisecontrolrb.thoughtworks.com)
attr_accessor :sleep_after_build_loop_error, :default_page
attr_accessor :default_page
attr_writer :build_request_checking_interval, :sleep_after_build_loop_error

def dashboard_url=(value)
@dashboard_url = remove_trailing_slash(value)
Expand All @@ -31,6 +31,10 @@ def projects_directory=(value)
"To configure this, set the CRUISE_DATA_ROOT environment variable"
end

def sleep_after_build_loop_error
@sleep_after_build_loop_error #.to_i
end

def build_request_checking_interval
@build_request_checking_interval.to_i
end
Expand Down
3 changes: 0 additions & 3 deletions lib/source_control/git.rb
Expand Up @@ -99,9 +99,6 @@ def load_new_changesets_from_origin
end
rescue Timeout::Error => e
raise BuilderError.new("Timeout in 'git fetch origin'")
rescue Exception => e
raise e if e.class == BuilderError
raise BuilderError.new("Exception while Git was loading new changesets from origin. #{e.class}: #{e.message}")
end

def git(operation, arguments = [], options = {}, &block)
Expand Down

0 comments on commit a14d4f3

Please sign in to comment.