From 23dc2d9522652906c8a10b21c57b8bdee9af8376 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 4 Feb 2016 13:26:04 +0100
Subject: [PATCH] Improved web server detection.

---
 app/models/observer/ticket/notification.rb | 2 +-
 config/initializers/web_server.rb          | 2 ++
 test/unit/ticket_notification_test.rb      | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 config/initializers/web_server.rb

diff --git a/app/models/observer/ticket/notification.rb b/app/models/observer/ticket/notification.rb
index 3f06a4b06..202cfcd35 100644
--- a/app/models/observer/ticket/notification.rb
+++ b/app/models/observer/ticket/notification.rb
@@ -18,7 +18,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
     EventBuffer.reset
 
     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
     end
 
diff --git a/config/initializers/web_server.rb b/config/initializers/web_server.rb
new file mode 100644
index 000000000..c442d9d93
--- /dev/null
+++ b/config/initializers/web_server.rb
@@ -0,0 +1,2 @@
+
+Rails.configuration.webserver_is_active = false
diff --git a/test/unit/ticket_notification_test.rb b/test/unit/ticket_notification_test.rb
index ac6139fdf..0bbfb7e42 100644
--- a/test/unit/ticket_notification_test.rb
+++ b/test/unit/ticket_notification_test.rb
@@ -86,7 +86,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
     assert(ticket1)
 
     # execute ticket events
-    ENV['SERVER_NAME'] = nil
+    Rails.configuration.webserver_is_active = nil
     Observer::Ticket::Notification.transaction
     #puts Delayed::Job.all.inspect
     Delayed::Worker.new.work_off
@@ -121,7 +121,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
     assert(ticket1)
 
     # execute ticket events
-    ENV['SERVER_NAME'] = 'some_host'
+    Rails.configuration.webserver_is_active = true
     Observer::Ticket::Notification.transaction
     #puts Delayed::Job.all.inspect
     Delayed::Worker.new.work_off
@@ -159,7 +159,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
     assert( ticket1, 'ticket created - ticket notification simple' )
 
     # execute ticket events
-    ENV['SERVER_NAME'] = 'some_host'
+    Rails.configuration.webserver_is_active = true
     Observer::Ticket::Notification.transaction
     #puts Delayed::Job.all.inspect
     Delayed::Worker.new.work_off