riser 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde718ab160b32665cc369a9802ede8b4001443dd53ca1c41cce55b09895a048
-  data.tar.gz: 11f103a7d7260481c059098c2859e267c8b870aed23e599ad1a5045a5a038530
+  metadata.gz: 0b5efba40ee7b569c9ed5f5e85f523b6bff9c2fe575d90d975925bcc91db5099
+  data.tar.gz: 612736390678ea1722e1626d20ad745221a3adfaa3a6461d69da701537ebcc65
 SHA512:
-  metadata.gz: c36db5ee689500348d5e53815917e9ee841b80abe4d50432699446ea21c7b928bbb3cf8a6e74705dc299cd0424c63dfd5c574b41053d1b8cc140fcd83b9ffea2
-  data.tar.gz: 4e46ece94c0dc1c8fe64ba0538803f8a504fd6d69348e68f2324dedc743c30e4842420596fb7fcdb711e0ec343efbda99766b8805039432628f931e41a8bfe23
+  metadata.gz: 690c6451ebbe725aecfdb21af32da37928ba56c238c72a4c7829624b0a606b7c4600a9a3184e4a6e79eaca6351b945af1f24336a7b504a2b12576dbbb1a8e377
+  data.tar.gz: 3587661269e1a3eb634c2f5f53d0fb360d7688370165aa3df05d836343d12ee7cd07ce76d05730bca615f40f62fd9c04fa30547c206612b5476de55d294f56f5

data/README.md

@@ -291,7 +291,7 @@ and
 ### TLS Server
 
 With OpenSSL, the riser is able to provide a TLS server.  To provide a
-TLS server you need a certificate and private key.  An example of a
+TLS server you need a certificate and a private key.  An example of a
 simple TLS server is as follows.
 
 ```ruby
@@ -308,7 +308,7 @@ Riser::Daemon.start_daemon(daemonize: false,
 
   ssl_context = OpenSSL::SSL::SSLContext.new
   ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(cert_path))
-  ssl_context.key = OpenSSL::PKey::RSA.new(File.read(pkey_path))
+  ssl_context.key = OpenSSL::PKey.read(File.read(pkey_path))
 
   server.dispatch{|socket|
     ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)

data/example/halo.rb

@@ -70,6 +70,7 @@ Riser::Daemon.start_daemon(daemonize: options[:daemonize],
                            server_privileged_group:         config['server_privileged_group']
                           ) {|server|
 
+  Riser.preload
   c = YAML.load_file(config_path)['server']
 
   logger = Logger.new(server_log)

data/example/simple_tls.rb

@@ -14,7 +14,7 @@ Riser::Daemon.start_daemon(daemonize: false,
 
   ssl_context = OpenSSL::SSL::SSLContext.new
   ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(cert_path))
-  ssl_context.key = OpenSSL::PKey::RSA.new(File.read(pkey_path))
+  ssl_context.key = OpenSSL::PKey.read(File.read(pkey_path))
 
   server.dispatch{|socket|
     ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)

data/lib/riser/daemon.rb

@@ -53,10 +53,14 @@ module Riser
           return
         end
 
-        server_address = SocketAddress.parse(address_config)
-        unless (server_address) then
-          @logger.error("failed to parse server address: #{address_config.inspect}")
+        begin
+          server_address = SocketAddress.parse(address_config)
+        rescue
+          @logger.error("failed to parse server address: #{address_config.inspect} [#{$!} (#{$!.class})]")
+          @logger.debug($!) if @logger.debug?
+          return
         end
+
         server_address
       end
 
@@ -70,7 +74,7 @@ module Riser
         end
       end
 
-      def get_socket_address(server_socket)
+      def get_sockaddr(server_socket)
         begin
           server_socket.local_address.inspect_sockaddr
         rescue
@@ -319,7 +323,7 @@ module Riser
 
     def server_socket_close(server_socket, server_address)
       # get local_address before close(2)
-      server_socket_address = @sysop.get_socket_address(server_socket) || server_address
+      server_socket_address = @sysop.get_sockaddr(server_socket) || server_address
 
       if (@sysop.close(server_socket)) then
         @logger.info("close server socket: #{server_socket_address}")
@@ -425,7 +429,7 @@ module Riser
         @logger.fatal('failed to start daemon.')
         return 1
       end
-      @logger.info("open server socket: #{@sysop.get_socket_address(server_socket) || server_address}")
+      @logger.info("open server socket: #{@sysop.get_sockaddr(server_socket) || server_address}")
 
       begin
         server_socket_option(server_socket, server_address)
@@ -466,16 +470,16 @@ module Riser
                   end
                 else
                   if (next_server_socket = @sysop.get_server_socket(next_server_address)) then
-                    @logger.info("open server socket: #{@sysop.get_socket_address(next_server_socket) || next_server_address}")
+                    @logger.info("open server socket: #{@sysop.get_sockaddr(next_server_socket) || next_server_address}")
                     server_socket_close(server_socket, server_address)
                     server_socket = next_server_socket
                     server_address = next_server_address
                   else
-                    @logger.warn("server socket continue: #{@sysop.get_socket_address(server_socket) || server_address}")
+                    @logger.warn("server socket continue: #{@sysop.get_sockaddr(server_socket) || server_address}")
                   end
                 end
               else
-                @logger.warn("server socket continue: #{@sysop.get_socket_address(server_socket) || server_address}")
+                @logger.warn("server socket continue: #{@sysop.get_sockaddr(server_socket) || server_address}")
               end
               server_socket_option(server_socket, server_address)
 

data/lib/riser/sockaddr.rb

@@ -46,14 +46,14 @@ module Riser
         case (config)
         when /\A tcp:/x
           uri = URI(config)
-          if (uri.host && uri.port) then
-            return TCPSocketAddress.new(unsquare.call(uri.host), uri.port)
-          end
+          uri.host or raise ArgumentError, 'need for a tcp socket uri host.'
+          uri.port or raise ArgumentError, 'need for a tcp socket uri port.'
+          return TCPSocketAddress.new(unsquare.call(uri.host), uri.port)
         when /\A unix:/x
           uri = URI(config)
-          if (uri.path && ! uri.path.empty?) then
-            return UNIXSocketAddress.new(uri.path)
-          end
+          uri.path or raise ArgumentError, 'need for a unix socket uri path.'
+          uri.path.empty? and raise ArgumentError, 'empty unix socket uri path.'
+          return UNIXSocketAddress.new(uri.path)
         when %r"\A [A-Za-z]+:/"x
           # unknown URI scheme
         when /\A (\S+):(\d+) \z/x
@@ -65,34 +65,67 @@ module Riser
         if (type = config[:type] || config['type']) then
           case (type.to_s)
           when 'tcp'
-            host    = config[:host]    || config['host']
-            port    = config[:port]    || config['port']
-            backlog = config[:backlog] || config['backlog']
-            if ((host && (host.is_a? String) && ! host.empty?) &&
-                (port && (port.is_a? Integer)) &&
-                (backlog.nil? || (backlog.is_a? Integer)))
-            then
-              return TCPSocketAddress.new(unsquare.call(host), port, backlog)
+            host = config[:host] || config['host'] or raise ArgumentError, 'need for a tcp socket host.'
+            (host.is_a? String) or raise TypeError, 'not a string tcp scoket host.'
+            host.empty? and raise ArgumentError, 'empty tcp socket host.'
+
+            port = config[:port] || config['port'] or raise ArgumentError, 'need for a tcp socket port.'
+            case (port)
+            when Integer
+              # OK
+            when String
+              service_name = port
+              port = Socket.getservbyname(service_name, 'tcp')
+            else
+              raise TypeError, 'port number is neither an integer nor a service name.'
+            end
+
+            if (backlog = config[:backlog] || config['backlog']) then
+              (backlog.is_a? Integer) or raise TypeError, 'not a integer tcp socket backlog.'
             end
+
+            return TCPSocketAddress.new(unsquare.call(host), port, backlog)
           when 'unix'
-            path    = config[:path]    || config['path']
-            backlog = config[:backlog] || config['backlog']
-            mode    = config[:mode]    || config['mode']
-            owner   = config[:owner]   || config['owner']
-            group   = config[:group]   || config['group']
-            if ((path && (path.is_a? String) && ! path.empty?) &&
-                (backlog.nil? || (backlog.is_a? Integer)) &&
-                (mode.nil? || (mode.is_a? Integer)) &&
-                (owner.nil? || (owner.is_a? Integer) || ((owner.is_a? String) && ! owner.empty?)) &&
-                (group.nil? || (group.is_a? Integer) || ((group.is_a? String) && ! group.empty?)))
-            then
-              return UNIXSocketAddress.new(path, backlog, mode, owner, group)
+            path = config[:path] || config['path'] or raise ArgumentError, 'need for a unix socket path.'
+            (path.is_a? String) or raise TypeError, 'not a string unix socket path.'
+            path.empty? and raise ArgumentError, 'empty unix socket path.'
+
+            if (backlog = config[:backlog] || config['backlog']) then
+              (backlog.is_a? Integer) or raise TypeError, 'not a integer unix socket backlog.'
             end
+
+            if (mode = config[:mode] || config['mode']) then
+              (mode.is_a? Integer) or raise TypeError, 'not a integer socket mode.'
+            end
+
+            if (owner = config[:owner] || config['owner']) then
+              case (owner)
+              when Integer
+                # OK
+              when String
+                owner.empty? and raise ArgumentError, 'empty unix socket owner.'
+              else
+                raise TypeError, 'unix socket owner is neither an integer nor a string.'
+              end
+            end
+
+            if (group = config[:group] || config['group']) then
+              case (group)
+              when Integer
+                # OK
+              when String
+                group.empty? and raise ArgumentError, 'empty unix socket group.'
+              else
+                raise TypeError, 'unix socket group is neither an integer nor a string.'
+              end
+            end
+
+            return UNIXSocketAddress.new(path, backlog, mode, owner, group)
           end
         end
       end
 
-      return
+      raise ArgumentError, 'invalid socket address.'
     end
   end
 

data/lib/riser/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module Riser
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end
 
 # Local Variables:

data/lib/riser.rb

@@ -21,6 +21,17 @@ module Riser
   autoload :TemporaryPath, 'riser/temppath'
   autoload :TimeoutSizedQueue, 'riser/server'
   autoload :WriteBufferStream, 'riser/stream'
+
+  def preload(namespace=Riser)
+    for name in namespace.constants
+      if (namespace.autoload? name) then
+        namespace.const_get(name)
+      end
+    end
+
+    nil
+  end
+  module_function :preload
 end
 
 # Local Variables:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Riser is a library of Ruby Infrastructure for cooperative multi-thread/multi-process