[BUGFIX] Ensure config gets correctly loaded by application

adhearsion · Jul 18, 2014 · 36a9d06 · 36a9d06
1 parent 6db1cea
commit 36a9d06
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # [develop](https://github.com/adhearsion/adhearsion)
   * Bugfix: Ignore dead calls when searching by tag
   * Bugfix: Routing a dead call should end cleanly ([#441](https://github.com/adhearsion/adhearsion/issues/441))
+  * Bugfix: Ensure config gets correctly loaded by application
 
 # [2.5.3](https://github.com/adhearsion/adhearsion/compare/v2.5.2...v2.5.3) - [2014-04-25](https://rubygems.org/gems/adhearsion/versions/2.5.3)
   * Bugfix: Do not quiesce until the second SIGTERM, as per documentation ([#483](https://github.com/adhearsion/adhearsion/issues/483))

diff --git a/lib/adhearsion/initializer.rb b/lib/adhearsion/initializer.rb
@@ -195,17 +195,17 @@ def load_lib_folder
     end
 
     def load_config_file
-      require "#{Adhearsion.config.root}/config/adhearsion.rb"
+      load "#{Adhearsion.config.root}/config/adhearsion.rb"
     end
 
     def load_events_file
       path = "#{Adhearsion.config.root}/config/events.rb"
-      require path if File.exists?(path)
+      load path if File.exists?(path)
     end
 
     def load_routes_file
       path = "#{Adhearsion.config.root}/config/routes.rb"
-      require path if File.exists?(path)
+      load path if File.exists?(path)
     end
 
     def init_get_logging_appenders