* make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043)

This commit is contained in:
Seth Call 2014-02-01 15:59:43 +00:00
parent 68221090eb
commit 6ae07fa187
5 changed files with 10 additions and 1 deletions

View File

@ -70,6 +70,8 @@ module JamRuby
cmd = APP_CONFIG.icecast_reload_cmd
result = execute(cmd)
raise "unable to execute icecast reload cmd=#{cmd}. result=#{$?}" unless result == 0
sleep APP_CONFIG.icecast_wait_after_reload
end
def run

View File

@ -299,7 +299,7 @@ describe MusicSession do
end
it "session listed if icecast_server config has been updated" do
pending "relative time problem"
pending "relative time problem (fails on seths mac, not linux)"
connection_with_mount.touch
session_with_mount.created_at = 2.minutes.ago
session_with_mount.save!(:validate => false)

View File

@ -49,6 +49,10 @@ def app_config
nil # generate a new password everytime
end
def icecast_wait_after_reload
0 # 0 seconds
end
def rabbitmq_host
"localhost"
end

View File

@ -184,6 +184,7 @@ include JamRuby
config.icecast_max_sourced_changed = 15 # 15 seconds
config.icecast_reload_slush = 3 # 3 seconds
config.icecast_hardcoded_source_password = nil # generate a new password everytim. production should always use this value
config.icecast_wait_after_reload = 5 # 5 seconds. a hack needed until VRFS-1043
config.email_alerts_alias = 'nobody@jamkazam.com' # should be used for 'oh no' server down/service down sorts of emails
config.email_generic_from = 'nobody@jamkazam.com'

View File

@ -57,5 +57,7 @@ SampleApp::Application.configure do
config.aws_bucket_public = 'jamkazam-testing'
config.aws_access_key_id = 'AKIAJESQY24TOT542UHQ' # credentials for jamkazam-tester user, who has access to this bucket
config.aws_secret_access_key = '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'
config.icecast_wait_after_reload = 0
end