correctly catch and log exceptions from CloudRequestForwarder

theforeman · Feb 13, 2025 · b7cbb6e · b7cbb6e
1 parent 9fa6578
commit b7cbb6e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/controllers/insights_cloud/api/machine_telemetries_controller.rb b/app/controllers/insights_cloud/api/machine_telemetries_controller.rb
@@ -16,7 +16,15 @@ class MachineTelemetriesController < ::Api::V2::BaseController
     # The method that "proxies" requests over to Cloud
     def forward_request
       certs = candlepin_id_cert @organization
-      @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
+      begin
+        @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
+      rescue RestClient::Exception => general_exception
+        logger.info("Forwarding request failed with exception: #{general_exception}")
+        return render json: { error: general_exception }, status: :bad_gateway
+      rescue RestClient::Timeout => timeout_exception
+        logger.info("Forwarding request failed with timeout: #{timeout_exception}")
+        return render json: { error: timeout_exception }, status: :gateway_timeout
+      end
 
       if @cloud_response.code == 401
         return render json: {