deal with ruby < 2.3 lacking Hash#dig

phusion · May 6, 2022 · 3b6a2c3 · 3b6a2c3
1 parent 9860e4c
commit 3b6a2c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb b/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb
@@ -254,7 +254,11 @@ def query_pool_json
         try_performing_ro_admin_basic_auth(request, @instance)
         response = @instance.http_request("agents.s/core_api", request)
         if response.code.to_i / 100 == 2
-          JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+          if RUBY_VERSION >= '2.3'
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+          else
+            JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value[:app_root][0][:value]}}
+          end
         elsif response.code.to_i == 401
           if response["pool-empty"] == "true"
             []

diff --git a/test/integration_tests/apache2_tests.rb b/test/integration_tests/apache2_tests.rb
@@ -631,7 +631,11 @@ def get_newest_instance
       request.basic_auth("ro_admin", instance.read_only_admin_password)
       response = instance.http_request("agents.s/core_api", request)
       if response.code.to_i / 100 == 2
-        groups = JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+        if RUBY_VERSION >= '2.3'
+          groups = JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value.dig(:app_root,0,:value)}}
+        else
+          groups = JSON.parse(response.body, symbolize_names: true).to_a.map{|(key,value)| {name: key.to_s, app_root: value[:app_root][0][:value]}}
+        end
       else
         raise response.body
       end