Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved web server detection.

Browse source
This commit is contained in:
Martin Edenhofer 2016-02-04 13:26:04 +01:00
parent 438bd42b8d
commit 23dc2d9522
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/observer/ticket/notification.rb
View file

@ -18,7 +18,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
EventBuffer.reset EventBuffer.reset
via_web = false via_web = false
if ENV['RACK_ENV'] || defined? Rails.configuration.webserver_is_active if ENV['RACK_ENV'] || Rails.configuration.webserver_is_active
via_web = true via_web = true
end end

2
config/initializers/web_server.rb Normal file
View file

@ -0,0 +1,2 @@
Rails.configuration.webserver_is_active = false

6
test/unit/ticket_notification_test.rb
View file

@ -86,7 +86,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert(ticket1) assert(ticket1)
# execute ticket events # execute ticket events
ENV['SERVER_NAME'] = nil Rails.configuration.webserver_is_active = nil
Observer::Ticket::Notification.transaction Observer::Ticket::Notification.transaction
#puts Delayed::Job.all.inspect #puts Delayed::Job.all.inspect
Delayed::Worker.new.work_off Delayed::Worker.new.work_off
@ -121,7 +121,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert(ticket1) assert(ticket1)
# execute ticket events # execute ticket events
ENV['SERVER_NAME'] = 'some_host' Rails.configuration.webserver_is_active = true
Observer::Ticket::Notification.transaction Observer::Ticket::Notification.transaction
#puts Delayed::Job.all.inspect #puts Delayed::Job.all.inspect
Delayed::Worker.new.work_off Delayed::Worker.new.work_off
@ -159,7 +159,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert( ticket1, 'ticket created - ticket notification simple' ) assert( ticket1, 'ticket created - ticket notification simple' )
# execute ticket events # execute ticket events
ENV['SERVER_NAME'] = 'some_host' Rails.configuration.webserver_is_active = true
Observer::Ticket::Notification.transaction Observer::Ticket::Notification.transaction
#puts Delayed::Job.all.inspect #puts Delayed::Job.all.inspect
Delayed::Worker.new.work_off Delayed::Worker.new.work_off