servitude 0.8.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f13c74949c47d98ecb7be0cfdd1fc46a32e6496
-  data.tar.gz: c8995f9320f6777635b6f261bb998893c3af67f5
+  metadata.gz: 3bc5c02aa6f0759b2c023219955399164bc1fb7f
+  data.tar.gz: ed9b38cdedb0f0a593619abd71ae5e23ceb0a351
 SHA512:
-  metadata.gz: 36bae4285106e9ace2eb9bb25b9a10e5b5de7c0e8ba727b8123198b0d9b004c9121253d219efdec755bd4a71bd31cc4cddf1029f37e81136d844856a85044047
-  data.tar.gz: 3227a9d4d2d0ba4e292d31072b3f5ba73cf5b47219f95a94ed1fe6165e40b65f82b69c3e0e45dfc6b04d0f0df74f6f2eeb54805f4b865c592e505ce56ef37f2e
+  metadata.gz: 9aed8c3cfb27f402763f0cbb60291d4c8d3f46c4b8afe4ad76860812210071f60e8a74a25101925c5d8f2e8922e159b666703c2b695bc4237924f20d3caf7916
+  data.tar.gz: 0722743586090901fbe060ee76f26efe40540e89fd7795b10ea2459eb319eac8bbcc872a5deebbd611a6905ac5914501039e4ffd7784078d15cfe56ad69f90b8

data/README.md

@@ -70,10 +70,7 @@ If you do not call ::boot, an error is raised before your server can be started.
            app_name: 'Aswesome Server',
            attribution: "v#{VERSION} \u00A9#{Time.now.year} Awesome, Inc."
            author: 'Awesome, Inc.',
-           default_config_path: "/etc/awesome/awesome-server.conf",
-           default_log_path: "/var/log/awesome/awesome-server.log",
-           default_pid_path: "/var/run/awesome/awesome-server.pid",
-           default_thread_count: 1
+           default_config_path: "/etc/awesome/awesome-server.conf"
     end
 
 ### Servitude::Cli

data/examples/1_simple_server

@@ -29,9 +29,6 @@ module SimpleServer
        author: 'LFE',
        use_config: false,
        default_config_path: nil,
-       default_log_path: nil,
-       default_pid_path: nil,
-       default_thread_count: nil
 
   class Server
 

data/examples/2_echo_server

@@ -35,9 +35,6 @@ module EchoServer
        author: 'LFE',
        use_config: false,
        default_config_path: nil,
-       default_log_path: nil,
-       default_pid_path: nil,
-       default_thread_count: nil
 
   class Server
 

data/examples/3_echo_server_with_cli_and_daemon

@@ -46,9 +46,6 @@ module EchoServer
        author: 'LFE',
        use_config: false,
        default_config_path: "#{PROJECT_ROOT}}/config/#{APP_FOLDER}.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
 
   class Cli < Servitude::Cli::Service
   end

data/examples/4_echo_server_with_cli_daemon_and_file_config

@@ -46,9 +46,6 @@ module EchoServer
        author: 'LFE',
        use_config: true,
        default_config_path: "#{PROJECT_ROOT}/config/4.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
 
   class Cli < Servitude::Cli::Service
   end

data/examples/5_echo_server_with_cli_daemon_and_env_config

@@ -54,9 +54,6 @@ module EchoServer
        author: 'LFE',
        use_config: true,
        default_config_path: "#{PROJECT_ROOT}/config/5.conf",
-       default_log_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.log",
-       default_pid_path: "#{PROJECT_ROOT}/tmp/#{APP_FOLDER}.pid",
-       default_thread_count: nil
 
   class Cli < Servitude::Cli::Service
   end

data/lib/servitude/base.rb

@@ -24,9 +24,6 @@ module Servitude
                 attribution: ( "v#{host_namespace::VERSION} Copyright © #{Time.now.year} #{author || company}" rescue nil ),
                 use_config: false,
                 default_config_path: nil,
-                default_log_path: nil,
-                default_pid_path: nil,
-                default_thread_count: nil,
                 server_class: ( host_namespace::Server rescue "#{host_namespace.name}::Server" ),
                 version_copyright: nil ) # TODO: Remove when version_copyright keyword deprecation expires
         unless host_namespace
@@ -70,9 +67,6 @@ module Servitude
         const_set :COMPANY, author # TODO: Remove when company keyword deprecation expires
         const_set :ATTRIBUTION, attribution
         const_set :DEFAULT_CONFIG_PATH, default_config_path
-        const_set :DEFAULT_LOG_PATH, default_log_path
-        const_set :DEFAULT_PID_PATH, default_pid_path
-        const_set :DEFAULT_THREAD_COUNT, default_thread_count
         const_set :USE_CONFIG, use_config
         const_set :VERSION_COPYRIGHT, attribution # TODO: Remove when version_copyright keyword deprecation expires
 
@@ -82,9 +76,6 @@ module Servitude
         Servitude.const_set :COMPANY, author # TODO: Remove when company keyword deprecation expires
         Servitude.const_set :ATTRIBUTION, attribution
         Servitude.const_set :DEFAULT_CONFIG_PATH, default_config_path
-        Servitude.const_set :DEFAULT_LOG_PATH, default_log_path
-        Servitude.const_set :DEFAULT_PID_PATH, default_pid_path
-        Servitude.const_set :DEFAULT_THREAD_COUNT, default_thread_count
         Servitude.const_set :SERVER_CLASS, server_class
         Servitude.const_set :USE_CONFIG, use_config
         Servitude.const_set :VERSION_COPYRIGHT, attribution # TODO: Remove when version_copyright keyword deprecation expires

data/lib/servitude/cli/service.rb

@@ -7,15 +7,15 @@ module Servitude
       end
 
       def self.pid_option
-        method_option :pid, desc: "The path for the PID file", type: :string, default: Servitude::DEFAULT_PID_PATH
+        method_option :pid, desc: "The path for the PID file", type: :string
       end
 
       def self.common_start_options
         method_option :config, type: :string, aliases: '-c', desc: "The path for the config file", default: Servitude::DEFAULT_CONFIG_PATH
         environment_option
-        method_option :log_level, desc: "The log level", type: :string, aliases: '-o', default: 'info'
-        method_option :log, desc: "The path for the log file", type: :string, aliases: '-l', default: Servitude::DEFAULT_LOG_PATH
-        method_option :threads, desc: "The number of threads", type: :numeric, aliases: '-t', default: Servitude::DEFAULT_THREAD_COUNT
+        method_option :log_level, desc: "The log level", type: :string, aliases: '-o'
+        method_option :log, desc: "The path for the log file", type: :string, aliases: '-l'
+        method_option :threads, desc: "The number of threads", type: :numeric, aliases: '-t'
       end
 
       desc "restart", "Stop and start the server"

data/lib/servitude/configuration.rb

@@ -1,33 +1,58 @@
-require 'delegate'
 require 'hashie'
-require 'oj'
+#require 'oj'
+require 'pathname'
+require 'yaml'
 
 module Servitude
-  class Configuration < SimpleDelegator
+  class Configuration < Hashie::Mash
 
-    def initialize( options={} )
-      options.reject! { |k,v| v.nil? }
+    def self.load( options={} )
+      merged_options = defaults.merge( file_options )
+      merged_options = merged_options.merge( options )
+      new( merged_options )
+    end
+
+    def self.config_filepath
+      Servitude::DEFAULT_CONFIG_PATH
+    end
 
-      if options[:use_config]
-        @_config = Hashie::Mash.new( file_options( options[:config] ))
-        _config.merge!( options )
-      else
-        @_config = Hashie::Mash.new( options )
-      end
+    def config_filepath
+      Pathname.new( self.class.config_filepath )
+    end
+
+    def slice( *keys )
+      klass.new( select { |k,v| keys.map( &:to_s ).include?( k ) } )
+    end
 
-      super _config
+    def for_env
+      return Hashie::Mash.new({}) unless env
+      self[env]
     end
 
   protected
 
-    attr_reader :_config
+    # Override to povide default config values
+    #
+    def self.defaults
+      {
+        threads: 1
+      }
+    end
+
+    def self.file_options
+      return {} unless config_filepath
 
-    def file_options( file_path )
-      unless File.file?( file_path )
-        raise "Configuration file #{file_path} does not exist"
-      end
+      File.exists?( config_filepath ) ?
+        load_file_options :
+        {}
+    end
+
+    def self.load_file_options
+      YAML::load( File.read( config_filepath ))
+    end
 
-      Oj.load( File.read( file_path ))
+    def klass
+      self.class
     end
 
   end

data/lib/servitude/server.rb

@@ -53,7 +53,7 @@ module Servitude
     end
 
     def initialize_config
-      Servitude.configuration = configuration_class.new( cli_options )
+      Servitude.configuration = configuration_class.load( cli_options )
     end
 
     def configuration_class

data/lib/servitude/server_logging.rb

@@ -42,7 +42,6 @@ module Servitude
       %w(
         help
         interactive
-        interactive_given
       )
     end
 

data/lib/servitude/server_threaded.rb

@@ -9,27 +9,51 @@ module Servitude
 
   protected
 
+    def handler_class
+      raise NotImplementedError
+    end
+
+    def run
+      raise NotImplementedError
+    end
+
     def with_supervision( &block )
       begin
         block.call
       rescue Servitude::SupervisionError
         # supervisor is restarting actor
-        #warn ANSI.cyan { "RETRYING due to waiting on supervisor to restart actor ..." }
+        warn_for_supevision_error
+        sleep( config.supervision_retry_timeout || 0 )
         retry
       rescue Celluloid::DeadActorError
         # supervisor has yet to begin restarting actor
-        #warn ANSI.blue { "RETRYING due to Celluloid::DeadActorError ..." }
+        warn_for_dead_actor_error
+        sleep( config.supervision_retry_timeout || 0 )
         retry
+      rescue => e
+        handle_error( payload, delivery_info, e )
       end
     end
 
+    def warn_for_supevision_error
+      warn "RETRYING due to waiting on supervisor to restart actor ..."
+    end
+
+    def warn_for_dead_actor_error
+      warn "RETRYING due to Celluloid::DeadActorError ..."
+    end
+
+    def handle_error( payload, delivery_info, e )
+      error( "#{e.class.name} | #{e.message} | #{e.backtrace.inspect}" )
+    end
+
     # Correctly calls a single supervised actor when the threads configuraiton is set
     # to 1, or a pool of actors if threads configuration is > 1.  Also protects against
     # a supervised actor from being nil if the supervisor is reinitializing when access
     # is attempted.
     #
     def call_handler_respecting_thread_count( options )
-      if options[:threads] > 1
+      if config.threads > 1
         pool.async.call( options )
       else
         raise Servitude::SupervisionError unless handler
@@ -37,16 +61,8 @@ module Servitude
       end
     end
 
-    def handler_class
-      raise NotImplementedError
-    end
-
-    def run
-      raise NotImplementedError
-    end
-
     def pool
-      @pool ||= handler_class.pool( size: options[:threads] )
+      @pool ||= handler_class.pool( size: config.threads )
     end
 
     def handler
@@ -54,7 +70,7 @@ module Servitude
     end
 
     def initialize_thread
-      return unless options[:threads] == 1
+      return unless config.threads == 1
       handler_class.supervise_as :handler
     end
 

data/lib/servitude/version.rb

@@ -1,3 +1,3 @@
 module Servitude
-  VERSION = "0.8.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servitude
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler