riser 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1acff6feaf608a07e3b7568fb2c39318ad866a0789ba0373a1941606693a6f7
-  data.tar.gz: 29b2b507d47f4bd96cf6c4fc3314146a9276bba516f971c9fbafe0516ea3a201
+  metadata.gz: 8df03f9ab3a57474378714b0167b765e3bab55322a64aebc570adf6cb1521581
+  data.tar.gz: f9385ce81e1349b5273da355077b92aec3461143e815ac5922aced80abd78d45
 SHA512:
-  metadata.gz: b7f538bf122eebe78979e0655a4e86f225914fbda516a3920f295cc7d66ad6a981736e60b043c3131c78a81937b8725d2e2105e83fb449771d96932bbf44462c
-  data.tar.gz: 60f523f8c30fe2c54f11141d28fd53d6d493ceae43dbb2b025996cd82f214cf86cd1125a4bcbe693da4445a61699da5807d8e1a050ad986e0ff5f2fa2755874c
+  metadata.gz: fcece7e7a1c149825a9c4308f8c9c5cf7dfaa71489ea94c87877cfa500ed119858c6c3bc4cde221560440cc69137ab3bfc4061ae010f61f772bc80e4ab8ea2e0
+  data.tar.gz: bd1290bb93c35f706aa8c06e9a350053ebb6b243013611ee51597cbbaecc41fc20e8372a78ab73a0fa69ceaa66d0052e629119b703751dabdfc45a9caae5c10d

data/example/simple_daemon.rb

@@ -1,17 +1,23 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
+require 'logger'
+require 'pathname'
 require 'riser'
 
+base_dir = Pathname(File.dirname($0))
+
 Riser::Daemon.start_daemon(daemonize: true,
                            daemon_name: 'simple_daemon',
-                           status_file: 'simple_daemon.pid',
+                           status_file: (base_dir + 'simple_daemon.pid').to_s,
                            listen_address: 'localhost:5000'
                           ) {|server|
 
+  logger = Logger.new((base_dir + 'simple_daemon.log').to_s)
   server.dispatch{|socket|
-    while (line = socket.gets)
-      socket.write(line)
+    stream = Riser::LoggingStream.new(socket, logger)
+    while (line = stream.gets)
+      stream.write(line)
     end
   }
 }

data/lib/riser.rb

@@ -3,26 +3,26 @@
 require 'riser/version'
 
 module Riser
-  autoload :AcceptTimeout, 'riser/server'
+  autoload :AcceptTimeout,      'riser/server'
   autoload :CompatibleStringIO, 'riser/compat'
-  autoload :DRbServiceCall, 'riser/services'
-  autoload :DRbServiceServer, 'riser/services'
-  autoload :DRbServices, 'riser/services'
-  autoload :Daemon, 'riser/daemon'
-  autoload :LoggingStream, 'riser/stream'
-  autoload :ReadPoll, 'riser/poll'
-  autoload :Resource, 'riser/resource'
-  autoload :ResourceSet, 'riser/resource'
-  autoload :RootProcess, 'riser/daemon'
-  autoload :ServerSignal, 'riser/server'
-  autoload :SocketAddress, 'riser/sockaddr'
-  autoload :SocketServer, 'riser/server'
-  autoload :StatusFile, 'riser/daemon'
-  autoload :Stream, 'riser/stream'
-  autoload :SystemOperation, 'riser/daemon'
-  autoload :TemporaryPath, 'riser/temppath'
-  autoload :TimeoutSizedQueue, 'riser/server'
-  autoload :WriteBufferStream, 'riser/stream'
+  autoload :DRbServiceCall,     'riser/services'
+  autoload :DRbServiceServer,   'riser/services'
+  autoload :DRbServices,        'riser/services'
+  autoload :Daemon,             'riser/daemon'
+  autoload :LoggingStream,      'riser/stream'
+  autoload :ReadPoll,           'riser/poll'
+  autoload :Resource,           'riser/resource'
+  autoload :ResourceSet,        'riser/resource'
+  autoload :RootProcess,        'riser/daemon'
+  autoload :ServerSignal,       'riser/server'
+  autoload :SocketAddress,      'riser/sockaddr'
+  autoload :SocketServer,       'riser/server'
+  autoload :StatusFile,         'riser/daemon'
+  autoload :Stream,             'riser/stream'
+  autoload :SystemOperation,    'riser/daemon'
+  autoload :TemporaryPath,      'riser/temppath'
+  autoload :TimeoutSizedQueue,  'riser/server'
+  autoload :WriteBufferStream,  'riser/stream'
 
   def preload(namespace=Riser)
     for name in namespace.constants

data/lib/riser/daemon.rb

@@ -299,10 +299,10 @@ module Riser
         if (@sysop.listen(server_socket, server_address.backlog)) then
           @logger.info("server socket backlog: #{server_address.backlog}")
         else
-          @logger.warn('server socket backlog is not changed.')
+          @logger.warn('server socket backlog cannot be changed.')
         end
       else
-        @logger.info('server socket backlog is default.')
+        @logger.info('server socket backlog is not changed.')
       end
 
       if (server_address.type == :unix) then
@@ -310,20 +310,20 @@ module Riser
           if (@sysop.chmod(server_address.mode, server_address.path)) then
             @logger.info("unix domain server socket mode: #{'%04o' % server_address.mode}")
           else
-            @logger.warn('unix domain server socket mode is not changed.')
+            @logger.warn('unix domain server socket mode cannot be changed.')
           end
         else
-          @logger.info('unix domain server socket mode is default.')
+          @logger.info('unix domain server socket mode is not changed.')
         end
 
         if (server_address.owner || server_address.group) then
           if (@sysop.chown(server_address.owner, server_address.group, server_address.path)) then
             @logger.info("unix domain server socket ownership: <#{server_address.owner}> <#{server_address.group}>")
           else
-            @logger.warn('unix domain server socket ownership is not changed.')
+            @logger.warn('unix domain server socket ownership cannot be changed.')
           end
         else
-          @logger.info('unix domain server socket ownership is default.')
+          @logger.info('unix domain server socket ownership is not changed.')
         end
       end
 
@@ -343,9 +343,9 @@ module Riser
 
       if (server_address.type == :unix) then
         if (@sysop.unlink(server_address.path)) then
-          @logger.info("delete unix server socket: #{server_address}")
+          @logger.info("delete unix domain server socket: #{server_address}")
         else
-          @logger.warn("failed to delete unix server socket: #{server_address}")
+          @logger.warn("failed to delete unix domain server socket: #{server_address}")
         end
       end
 
@@ -631,6 +631,7 @@ module Riser
       daemon_name: 'ruby'.freeze,
       daemon_debug: $DEBUG,
       daemon_nochdir: true,
+      daemon_umask: 0037,
       status_file: nil,
       listen_address: nil,
       server_polling_interval_seconds: 3,
@@ -659,6 +660,8 @@ module Riser
       c = DEFAULT.dup
       c.update(config)
 
+      File.umask(c[:daemon_umask])
+
       if (c[:status_file]) then
         status_file = StatusFile.new(c[:status_file])
         status_file.open

data/lib/riser/services.rb

@@ -253,7 +253,7 @@ module Riser
     private :get_single_process_service
 
     def get_sticky_process_service(name, stickiness_key)
-      get_druby_service(name, stickiness_key.hash % @druby_call_list.length)
+      get_druby_service(name, [ name, stickiness_key ].hash % @druby_call_list.length)
     end
     private :get_sticky_process_service
 

data/lib/riser/stream.rb

@@ -83,7 +83,19 @@ module Riser
     def self.make_tag(io)
       hex = Digest::SHA256.hexdigest(io.to_s)[0, 7]
       fd = io.to_io.to_i
-      "[#{hex},#{fd}]"
+      if (io.respond_to? :remote_address) then
+        addr = io.remote_address
+        if (addr.ip?) then
+          # expected only stream type
+          "[#{hex},#{fd},tcp://#{io.remote_address.inspect_sockaddr}]"
+        elsif (addr.unix?) then
+          "[#{hex},#{fd},unix:#{io.remote_address.unix_path}]"
+        else
+          "[#{hex},#{fd},unknown:#{io.remote_address.inspect_sockaddr}]"
+        end
+      else
+        "[#{hex},#{fd}]"
+      end
     end
 
     def initialize(io, logger)

data/lib/riser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler