riser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac8260579321a152af6b38fe4305936934ede2893c1b9ede48a1c85563aad8d
-  data.tar.gz: 93a8e6145c9d53e94ed3443d46dc64c55460638a60eab2097bc563eff9f2b724
+  metadata.gz: 975698c3877ded2e7599a5aaf11ffa3c8781356f7d84c4260573ee39d62343e5
+  data.tar.gz: 7c28ab28e041f75cda185407754c930cb6f09e4aeac675aa5e742f85c67e0325
 SHA512:
-  metadata.gz: 59148c981335471f2c57d0caca09b1b8272008180fbe045e2f5f13988996c020741930419c4df73570811d148bd66df89f2c5aa260767852df6fd8627f711bb3
-  data.tar.gz: f0ba2792523825f164376e19a841274c685aca4dab7c8f32a5b88a496c97dcbb5eb5a077a36b417029ad3cf1db885df300c096164b840b3c06b3387c91a5ad8a
+  metadata.gz: 3018b4967b5e4d722d1f969613a741e1bf40073e48af87bfa63c9898183a99699516a55e35cbb554fe0a0b5cefc2bdb5f99c0f74d0a177b684d801a592e3f182
+  data.tar.gz: 3e811b04172f0855f82e0f86c2b049781dff8f13ceaa4437c4f6e43d1bea7f4d99dc8a9a1d6ebe620a81d23bd154c2af3e40577735a1a49f4163315d11db8026

data/example/halo.rb

@@ -48,11 +48,11 @@ OptionParser.new{|opts|
 }.parse!
 
 name = File.basename($0, '.rb')
-HALO = IO.read(File.join(File.dirname($0), "#{name}.html"))
 server_log   = File.join(File.dirname($0), "#{name}.log")
 protocol_log = File.join(File.dirname($0), 'protocol.log')
 status_file  = File.join(File.dirname($0), "#{name}.pid")
 config_path  = File.join(File.dirname($0), "#{name}.yml")
+halo_html    = File.join(File.dirname($0), "#{name}.html")
 
 config = YAML.load_file(config_path)['daemon']
 
@@ -107,6 +107,8 @@ Riser::Daemon.start_daemon(daemonize: options[:daemonize],
   server.preprocess{ logger.info('preprocess') }
   server.postprocess{ logger.info('postprocess') }
 
+  halo = File.read(halo_html)
+
   server.dispatch{|socket|
     begin
       read_poll = Riser::ReadPoll.new(socket)
@@ -141,10 +143,10 @@ Riser::Daemon.start_daemon(daemonize: options[:daemonize],
             when 'GET', 'HEAD'
               stream << "HTTP/1.0 200 OK\r\n"
               stream << "Content-Type: text/html\r\n"
-              stream << "Content-Length: #{HALO.bytesize}\r\n"
+              stream << "Content-Length: #{halo.bytesize}\r\n"
               stream << "Date: #{t.httpdate}\r\n"
               stream << "\r\n"
-              stream << HALO if (method == 'GET')
+              stream << halo if (method == 'GET')
             else
               stream << "HTTP/1.0 405 Method Not Allowed\r\n"
               stream << "Content-Type: text/plain\r\n"

data/lib/riser/daemon.rb

@@ -70,6 +70,16 @@ module Riser
         end
       end
 
+      def get_socket_address(server_socket)
+        begin
+          server_socket.local_address.inspect_sockaddr
+        rescue
+          @logger.error("failed to get socket address: #{server_socket} [#{$!} (#{$!.class})]")
+          @logger.debug($!) if @logger.debug?
+          nil
+        end
+      end
+
       def listen(server_socket, backlog)
         begin
           server_socket.listen(backlog)
@@ -309,12 +319,12 @@ module Riser
 
     def server_socket_close(server_socket, server_address)
       # get local_address before close(2)
-      server_socket_local_address = server_socket.local_address
+      server_socket_address = @sysop.get_socket_address(server_socket) || server_address
 
       if (@sysop.close(server_socket)) then
-        @logger.info("close server socket: #{server_socket_local_address.inspect_sockaddr}") 
+        @logger.info("close server socket: #{server_socket_address}")
       else
-        @logger.warn("failed to close server socket: #{server_socket_local_address.inspect_sockaddr}")
+        @logger.warn("failed to close server socket: #{server_socket_address}")
       end
 
       if (server_address.type == :unix) then
@@ -353,7 +363,7 @@ module Riser
 
           server = SocketServer.new
           @server_setup.call(server)
-          server.setup(server_socket)
+          server.setup(server_socket) # ready to accept signal(2)
           Signal.trap(SIGNAL_STOP_GRACEFUL) { server.signal_stop_graceful }
           Signal.trap(SIGNAL_STOP_FORCED) { server.signal_stop_forced }
           Signal.trap(SIGNAL_STAT_GET_AND_RESET) { server.signal_stat_get(reset: true) }
@@ -365,7 +375,9 @@ module Riser
           raise
         end
         @logger.close
+
         latch_write_io.puts("server process (pid: #{$$}) is ready to go.")
+        latch_write_io.close
 
         server.start(server_socket)
       }
@@ -413,7 +425,7 @@ module Riser
         @logger.fatal('failed to start daemon.')
         return 1
       end
-      @logger.info("open server socket: #{server_socket.local_address.inspect_sockaddr}")
+      @logger.info("open server socket: #{@sysop.get_socket_address(server_socket) || server_address}")
 
       begin
         server_socket_option(server_socket, server_address)
@@ -454,16 +466,16 @@ module Riser
                   end
                 else
                   if (next_server_socket = @sysop.get_server_socket(next_server_address)) then
-                    @logger.info("open server socket: #{next_server_socket.local_address.inspect_sockaddr}")
+                    @logger.info("open server socket: #{@sysop.get_socket_address(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: #{server_socket.local_address.inspect_sockaddr}")
+                    @logger.warn("server socket continue: #{@sysop.get_socket_address(server_socket) || server_address}")
                   end
                 end
               else
-                @logger.warn("server socket continue: #{server_socket.local_address.inspect_sockaddr}")
+                @logger.warn("server socket continue: #{@sysop.get_socket_address(server_socket) || server_address}")
               end
               server_socket_option(server_socket, server_address)
 

data/lib/riser/server.rb

@@ -301,23 +301,21 @@ module Riser
     end
 
     def apply_signal_stat(queue)
-      unless (@stat_operation_queue.empty?) then
-        while (stat_ope = @stat_operation_queue.shift)
-          case (stat_ope)
-          when :get_and_reset
-            queue.stat_start
-            @at_stat.call(queue.stat_get(reset: true))
-            @at_stat_get.call(true)
-          when :get
-            queue.stat_start
-            @at_stat.call(queue.stat_get(reset: false))
-            @at_stat_get.call(false)
-          when :stop
-            queue.stat_stop
-            @at_stat_stop.call
-          else
-            raise "internal error: unknown stat operation <#{stat_ope.inspect}>"
-          end
+      while (stat_ope = @stat_operation_queue.shift)
+        case (stat_ope)
+        when :get_and_reset
+          queue.stat_start
+          @at_stat.call(queue.stat_get(reset: true))
+          @at_stat_get.call(true)
+        when :get
+          queue.stat_start
+          @at_stat.call(queue.stat_get(reset: false))
+          @at_stat_get.call(false)
+        when :stop
+          queue.stat_stop
+          @at_stat_stop.call
+        else
+          raise "internal error: unknown stat operation <#{stat_ope.inspect}>"
         end
       end
     end

data/lib/riser/version.rb

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

data/riser.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Riser is a library of Ruby Infrastructure for cooperative multi-thread/multi-process SERver}
   spec.description   = <<-'EOF'
     Riser is a library of Ruby Infrastructure for cooperative multi-thread/multi-process SERver.
-    This library is useful to make multi-thread/multi-process socket server and daemon. 
+    This library is useful to make multi-thread/multi-process socket server and daemon.
   EOF
   spec.homepage      = "https://github.com/y10k/riser"
   spec.license       = "MIT"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,9 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "    Riser is a library of Ruby Infrastructure for cooperative multi-thread/multi-process
-  SERver.\n    This library is useful to make multi-thread/multi-process socket server
-  and daemon. \n"
+description: |2
+      Riser is a library of Ruby Infrastructure for cooperative multi-thread/multi-process SERver.
+      This library is useful to make multi-thread/multi-process socket server and daemon.
 email:
 - toki@freedom.ne.jp
 executables: []