opener-daemons 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d343e353902637e8107d0fae767b78ae6f1d5088
-  data.tar.gz: ca6e691a8224d1d8b9fdc10e1fa60b688f4e13c3
+  metadata.gz: 081edcf7e60af228857624b50af9619ff3fb0118
+  data.tar.gz: 4bb69b101678efd7b05bfe222a92fd211c13db59
 SHA512:
-  metadata.gz: c4e8da4cb952e4168d1e82dcb7c1a50e60558355618919ed33f0384ea8ebfe948701eb369367dde02fab5f1b5c6894a7de0994ed501bba516331e30978eaf228
-  data.tar.gz: c5b0205a179c591d1389c62696aae256e2973a6b446a91f5885aacef2229597384a3d4af095bad50ad01e3bee6e42cb3855dc377828da1b4af920d63788d10a4
+  metadata.gz: 3f709e600af06649e4e631456a313750d976fbf5fdebbf2b33ae7bfd52e24a3e4d118595892b3dc9277a6880cf0438f1f042e37c9a22948cf9be695c8abff459
+  data.tar.gz: 4e52fac8c46818eff00f1a9b3a5cba0b37a6aeb807c71a30dd93b150f2acf630567a61cfa4cd9a3c11f8ef4bb47702ab582aef0952bb85503921ad95af170029

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end # Daemons
 end # Opener

data/lib/opener/daemons/worker.rb

@@ -41,8 +41,35 @@ module Opener
       def process
         add_transaction_attributes
 
-        input  = downloader.download(config.input_url)
-        output = config.component_instance.run(input)
+        begin
+          output = run_component
+          object = upload_output(output)
+
+          submit_callbacks(object)
+
+        # Unsupported languages are handled in a different manner as they can
+        # occur quite often. In these cases we _do_ want the data to be sent
+        # to the final callback URL (skipping whatever comes before it) so it
+        # can act upon it.
+        rescue Core::UnsupportedLanguageError
+          handle_unsupported_language
+        end
+      end
+
+      ##
+      # @return [String]
+      #
+      def run_component
+        input = downloader.download(config.input_url)
+
+        return config.component_instance.run(input)
+      end
+
+      ##
+      # @param [String] output
+      # @return [AWS::S3::S3Object]
+      #
+      def upload_output(output)
         object = uploader.upload(config.identifier, output, config.metadata)
 
         Core::Syslog.info(
@@ -50,7 +77,7 @@ module Opener
           config.metadata
         )
 
-        submit_callbacks(object)
+        return object
       end
 
       ##
@@ -74,6 +101,25 @@ module Opener
         Core::Syslog.info("Submitted response to #{next_url}", config.metadata)
       end
 
+      ##
+      # Sends the unsupported input to the last callback URL.
+      #
+      def handle_unsupported_language
+        last_url = config.callbacks.last
+
+        callback_handler.post(
+          last_url,
+          :input_url  => config.input_url,
+          :identifier => config.identifier,
+          :metadata   => config.metadata
+        )
+
+        Core::Syslog.info(
+          "Submitted input with an unsupported language to #{last_url}",
+          config.metadata
+        )
+      end
+
       private
 
       def add_transaction_attributes

data/opener-daemons.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '~> 1.0'
   spec.add_dependency 'slop', '~> 3.0'
   spec.add_dependency 'opener-callback-handler', '~> 1.0'
-  spec.add_dependency 'opener-core', '~> 2.0'
+  spec.add_dependency 'opener-core', '~> 2.3'
   spec.add_dependency 'newrelic_rpm'
   spec.add_dependency 'json-schema'
   spec.add_dependency 'rollbar', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Wilco van Duinkerken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement