Passenger Standalone: correctly report Passengerfile.json syntax erro…

…r instead of crashing
phusion · Jun 21, 2015 · edb1e7a · edb1e7a
1 parent 4661247
commit edb1e7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,7 @@ Release 5.0.11
  * In 5.0.10, admin tools such as `passenger-status` and `passenger-config restart-app` display an authorization error if they are run without sudo, while at the same time Passenger isn't serving any applications. Since this is confusing, they have now been modified to display a more appropriate error message.
  * Fixes a bug in the RPMs that prevent admin tools such as `passenger-status` and `passenger-config restart-app` from working without root privileges.
  * Fixes a bug that causes Passenger not to work if the HOME environment variable is not set.
+ * If Passengerfile.json contains a syntax error, Passenger Standalone now correctly prints an error message instead of crashing.
  * Sending a SIGABRT signal to a Ruby process now properly makes it terminate.
 
 

diff --git a/lib/phusion_passenger/standalone/start_command.rb b/lib/phusion_passenger/standalone/start_command.rb
@@ -386,7 +386,7 @@ def load_local_config_file
         if app_dir
           begin
             ConfigUtils.load_local_config_file!(app_dir, @local_options)
-          rescue ConfigLoadError => e
+          rescue ConfigUtils::ConfigLoadError => e
             abort "*** ERROR: #{e.message}"
           end
         end