opener-daemons 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd43444725d72e2076b674d5c1a4ae46b7c2a514
-  data.tar.gz: a315f9989260c5c36efbe29d412120abcef97802
+  metadata.gz: b735bf7aefc0ca1766255d81d62e597462da367c
+  data.tar.gz: 8d724df16b36cf5d5b9368eec4c49b467b793607
 SHA512:
-  metadata.gz: 29f9b444314f438ab37d2732f2d3dd115993122a31bc4dd63b3b2b7e98d6b4a8d12ff2f159fc57b16d501635d8d05db244717af95874ab4243a87be49c211f5a
-  data.tar.gz: 0f9ce2a6d61f73eeac95b24045b75dfe628e2bdad9ce3e780fa50a287d63597e8138ca44d2f11455b343d22c1d85f8e403aff3dc7597b0e60b523c64039c8f06
+  metadata.gz: 8eb26750e9635ea9a32588266ea628666f09499169031a0753624ea17a9bd5c2410f4e39c88583c40ed6e3a7dfaaa31338e50c063cb3c8f5dc8c3e6c2d5daaa6
+  data.tar.gz: 67e25b0fd92b99955afeebfe83fe523f2a0301441da1358df04477d3b87ccda15a34c2c167206b010d66bf7bafc22f04243af6ad22407950081f67139d4e7339

data/lib/opener/daemons/daemon.rb

@@ -37,9 +37,12 @@ module Opener
       # Called before the daemon is started.
       #
       def before_start
-        Syslog.open(ENV['APP_NAME'], ::Syslog::LOG_CONS | ::Syslog::LOG_PID)
+        Core::Syslog.open(
+          ENV['APP_NAME'],
+          ::Syslog::LOG_CONS | ::Syslog::LOG_PID
+        )
 
-        Syslog.info(
+        Core::Syslog.info(
           'Starting daemon',
           :queue   => option(:queue_name),
           :threads => threads
@@ -85,7 +88,7 @@ module Opener
       def complete(message, output, timings)
         log_msg = "Finished message #{message.id}"
 
-        Syslog.info(log_msg)
+        Core::Syslog.info(log_msg)
       end
 
       ##

data/lib/opener/daemons/daemons.rb

@@ -18,15 +18,6 @@ module Opener
       return !!ENV['ROLLBAR_TOKEN']
     end
 
-    ##
-    # Returns `true` if Syslog should be enabled.
-    #
-    # @return [TrueClass|FalseClass]
-    #
-    def self.syslog?
-      return !!ENV['ENABLE_SYSLOG']
-    end
-
     ##
     # Returns the name of the input queue to use.
     #

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end # Daemons
 end # Opener

data/lib/opener/daemons/worker.rb

@@ -45,7 +45,7 @@ module Opener
         output   = config.component_instance.run(input)
         object   = uploader.upload(config.identifier, output, config.metadata)
 
-        Syslog.info(
+        Core::Syslog.info(
           "Wrote output to s3://#{Daemons.output_bucket}/#{object.key}",
           config.metadata
         )
@@ -79,7 +79,7 @@ module Opener
           :metadata   => config.metadata
         )
 
-        Syslog.info("Submitted response to #{next_url}", config.metadata)
+        Core::Syslog.info("Submitted response to #{next_url}", config.metadata)
       end
 
       private

data/lib/opener/daemons.rb

@@ -1,6 +1,4 @@
 require 'timeout'
-require 'syslog'
-require 'logger'
 require 'securerandom'
 
 require 'aws-sdk'
@@ -9,6 +7,7 @@ require 'slop'
 require 'oni'
 require 'oni/daemons/sqs'
 require 'opener/callback_handler'
+require 'opener/core'
 require 'new_relic/control'
 require 'rollbar'
 require 'json-schema'
@@ -21,7 +20,6 @@ require_relative 'daemons/pidfile'
 require_relative 'daemons/configuration'
 require_relative 'daemons/downloader'
 require_relative 'daemons/uploader'
-require_relative 'daemons/syslog'
 
 require_relative 'daemons/mapper'
 require_relative 'daemons/worker'

data/opener-daemons.gemspec

@@ -23,6 +23,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 '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.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Wilco van Duinkerken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: opener-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +204,6 @@ files:
 - lib/opener/daemons/mapper.rb
 - lib/opener/daemons/option_parser.rb
 - lib/opener/daemons/pidfile.rb
-- lib/opener/daemons/syslog.rb
 - lib/opener/daemons/uploader.rb
 - lib/opener/daemons/version.rb
 - lib/opener/daemons/worker.rb

data/lib/opener/daemons/syslog.rb

@@ -1,58 +0,0 @@
-module Opener
-  module Daemons
-    ##
-    # Wrapper around `Syslog` that makes it easier to disable loggers and to log
-    # custom key/value pairs in message.
-    #
-    module Syslog
-      ##
-      # Configures Syslog.
-      #
-      # @see [Syslog.open]
-      # @param [String] name The name of the program.
-      # @param [Fixnum] facility
-      #
-      def self.open(name, facility = nil)
-        ::Syslog.open(name, facility) if Daemons.syslog?
-      end
-
-      # methods defined using define_method() are slower than those defined
-      # using eval() on JRuby and Rubinius.
-      [:debug, :err, :fatal, :info, :warn, :unknown].each do |method|
-        eval <<-EOF, nil, __FILE__, __LINE__ + 1
-        def self.#{method}(message, meta = {})
-          add(:#{method}, message, meta)
-        end
-        EOF
-      end
-
-      ##
-      # Adds a new log message.
-      #
-      # @example
-      #  add(:info, 'Testing Syslog', :user_id => 19)
-      #
-      # @param [Symbol] type The type of log message to add, corresponds to the
-      #  logger method that will be called.
-      #
-      # @param [String] message The message to log.
-      # @param [Hash] meta Extra meta data to log.
-      #
-      def self.add(type, message, meta = {})
-        return unless Daemons.syslog?
-
-        pairs = make_pairs(meta)
-
-        ::Syslog.send(type, "#{pairs} #{message}".strip)
-      end
-
-      ##
-      # @param [Hash] meta
-      # @return [String]
-      #
-      def self.make_pairs(meta)
-        return meta.map { |(key, value)| "#{key}=#{value.inspect}" }.join(' ')
-      end
-    end # Syslog
-  end # Daemons
-end # Opener