huginn_http_request_agent 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 653100f0a586c808cea718f38a8e55873b20666b
-  data.tar.gz: 610976e15c13270eaaea835188f0d93ecb6bbe29
+SHA256:
+  metadata.gz: efc2ffa3f090b8c268492b91a79a0914ee18bbbdd431b714160d65856f34be24
+  data.tar.gz: 276b80b72c60689cedb18d2f1e6e9fed117bbfe97229d06aa138e04a3cca8c0e
 SHA512:
-  metadata.gz: 9a8d6736777a825a9115d54532866c45e6657b38ce90beae9a317556f6485ebac898b33ed3503c7003c87307801dc62db1be047dcd4d17eacad6c13986aaa549
-  data.tar.gz: e88736b87e88e5602b3a081e1745887d7e63cc0d5b3d0fea56e91242c37432480396acab0e8079e4694d24eb2af7ab6b8bfa6a6f7060e431e05d7cc6ae5affab
+  metadata.gz: 64f2207730c600ce39d38267057377af946164c50dbf15fe6b0a9108384fb16685511cef5105bffbee462ed59c493f60b78dd5bd2969061318be0cfd0eac169e
+  data.tar.gz: c2204699225a8867b3a4b5955724935e49964b6d1e65158413c8af42035a9dd4506c0e090977a96c216784b2fd93855e94b186967344aa4e2860d2e23e251ba5

data/lib/huginn_http_request_agent/http_request_agent.rb

@@ -242,34 +242,68 @@ module Agents
         log({ method: method, url: url, body: body, headers: headers })
       end
 
-      response = faraday.run_request(method.to_sym, url, body, headers) { |request|
+      output_event = interpolated['output_mode'].to_s == 'merge' ? event.payload.dup : {}
 
-        # open/read timeout in seconds
-        if interpolated['timeout'].to_i
-            request.options.timeout = interpolated['timeout'].to_i
-        end
+      begin
 
-        # connection open timeout in seconds
-        if interpolated['open_timeout'].to_i
-            request.options.open_timeout = interpolated['open_timeout'].to_i
-        end
+        response = faraday.run_request(method.to_sym, url, body, headers) { |request|
 
-        request.params.update(params) if params
-      }
+          # open/read timeout in seconds
+          if interpolated['timeout'].to_i
+              request.options.timeout = interpolated['timeout'].to_i
+          end
 
-      if boolify(interpolated['emit_events'])
-        new_event = interpolated['output_mode'].to_s == 'merge' ? event.payload.dup : {}
-        create_event payload: new_event.merge(
-          body: response.body,
-          status: response.status
-        ).merge(
-          event_headers_payload(response.headers)
-        )
+          # connection open timeout in seconds
+          if interpolated['open_timeout'].to_i
+              request.options.open_timeout = interpolated['open_timeout'].to_i
+          end
+
+          request.params.update(params) if params
+        }
+
+        if boolify(interpolated['emit_events'])
+          create_event payload: output_event.merge(
+            body: response.body,
+            status: response.status
+          ).merge(
+            event_headers_payload(response.headers)
+          )
+        end
+      rescue => e
+        handle_req_error(e, output_event, url)
       end
     end
 
     def event_headers_key
       super || 'headers'
     end
-  end
+
+    def handle_req_error( error, output_payload, endpoint )
+
+      error_status = defined?(error.response_status)  && !error.response_status.nil? ? error.response_status : 500
+
+      #  NOTE:  `options['payload']`` below is intentionally _NOT_ interpolated.
+      #  The primary reason for this is that it may contain sensitive values
+      #  By passing the raw option, we will see liquid placeholders instead.
+      #  This wiill assist with debugging while also not exposing secrets.
+
+      log({
+        error_message: error.message,
+        status_code: error_status,
+        endpoint: endpoint,
+        payload_options: options['payload'],
+      })
+
+      if boolify(interpolated['emit_events'])
+        create_event payload: output_payload.merge(
+          status: error_status,
+          error_message: error.message,
+          endpoint: endpoint,
+          payload_options: options['payload'],
+        )
+      end
+
+    end
+
+  end # <-- End of class
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huginn_http_request_agent
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jacob Spizziri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Http Request Agent is intended to be an abstract agent that allows for