riser 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5efba40ee7b569c9ed5f5e85f523b6bff9c2fe575d90d975925bcc91db5099
-  data.tar.gz: 612736390678ea1722e1626d20ad745221a3adfaa3a6461d69da701537ebcc65
+  metadata.gz: ef14df0b3e4899c0d573754bdc7071bd88ee89103d51d51d547a200bf9d305a5
+  data.tar.gz: f3784e9ec64b88fe4ca68a51ceeffba1af2ba1c4e6fa464a555a76da27c6c98f
 SHA512:
-  metadata.gz: 690c6451ebbe725aecfdb21af32da37928ba56c238c72a4c7829624b0a606b7c4600a9a3184e4a6e79eaca6351b945af1f24336a7b504a2b12576dbbb1a8e377
-  data.tar.gz: 3587661269e1a3eb634c2f5f53d0fb360d7688370165aa3df05d836343d12ee7cd07ce76d05730bca615f40f62fd9c04fa30547c206612b5476de55d294f56f5
+  metadata.gz: 190ba65ce5b250938ebd92ae5cebf8a96b2995a19221e8c8a39ad2024e18f7c24f1cb07570d2c2c60374363572c79083a2ca50d16fb503581192c1b0ee142142
+  data.tar.gz: 97f9c5de7034224540e9c4e118e45a6d99179a143d2cd2ce375f0e4cf53a8c0a641b5ec1a43667da71ad75709a16395059ff69019c8a86f971862f941dbe1ace

data/Rakefile

@@ -17,7 +17,7 @@ Rake::RDocTask.new do |rd|
   rd.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Build README.html from markdown source.'
+desc 'Build README.html from markdown source'
 task :readme => %w[ README.html ]
 
 file 'README.html' => [ 'README.md' ] do

data/lib/riser.rb

@@ -18,6 +18,7 @@ module Riser
   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'

data/lib/riser/daemon.rb

@@ -25,6 +25,16 @@ module Riser
       @file.flock(File::LOCK_EX | File::LOCK_NB)
     end
 
+    def self.locked?(status_file_path)
+      begin
+        File.open(status_file_path, File::WRONLY) {|lock_file|
+          ! lock_file.flock(File::LOCK_EX | File::LOCK_NB)
+        }
+      rescue Errno::ENOENT
+        false
+      end
+    end
+
     def write(text)
       @file.truncate(0)
       @file.seek(0)
@@ -34,158 +44,158 @@ module Riser
     end
   end
 
-  class RootProcess
-    class SystemOperation
-      def initialize(logger, module_FileUtils: FileUtils, module_Process: Process, class_IO: IO, class_File: File)
-        @logger = logger
-        @FileUtils = module_FileUtils
-        @Process = module_Process
-        @IO = class_IO
-        @File = class_File
-      end
-
-      def get_server_address(sockaddr_get)
-        begin
-          address_config = sockaddr_get.call
-        rescue
-          @logger.error("failed to get server address [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          return
-        end
+  class SystemOperation
+    def initialize(logger, module_FileUtils: FileUtils, module_Process: Process, class_IO: IO, class_File: File)
+      @logger = logger
+      @FileUtils = module_FileUtils
+      @Process = module_Process
+      @IO = class_IO
+      @File = class_File
+    end
 
-        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
+    def get_server_address(sockaddr_get)
+      begin
+        address_config = sockaddr_get.call
+      rescue
+        @logger.error("failed to get server address [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        return
+      end
 
-        server_address
+      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
 
-      def get_server_socket(server_address)
-        begin
-          server_address.open_server
-        rescue
-          @logger.error("failed to open server socket: #{server_address} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+      server_address
+    end
+
+    def get_server_socket(server_address)
+      begin
+        server_address.open_server
+      rescue
+        @logger.error("failed to open server socket: #{server_address} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def get_sockaddr(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
+    def get_sockaddr(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)
-        rescue
-          @logger.error("failed to listen(2) server socket with backlog: #{backlog} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def listen(server_socket, backlog)
+      begin
+        server_socket.listen(backlog)
+      rescue
+        @logger.error("failed to listen(2) server socket with backlog: #{backlog} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def chmod(mode, path)
-        begin
-          @FileUtils.chmod(mode, path)
-        rescue
-          @logger.error("failed to chmod(2): #{'%04o' % mode} #{path} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def chmod(mode, path)
+      begin
+        @FileUtils.chmod(mode, path)
+      rescue
+        @logger.error("failed to chmod(2): #{'%04o' % mode} #{path} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def chown(owner, group, path)
-        begin
-          @FileUtils.chown(owner, group, path)
-        rescue
-          @logger.error("failed to chown(2): <#{owner}> <#{group}> <#{path}> [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def chown(owner, group, path)
+      begin
+        @FileUtils.chown(owner, group, path)
+      rescue
+        @logger.error("failed to chown(2): <#{owner}> <#{group}> <#{path}> [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def send_signal(pid, signal)
-        begin
-          @Process.kill(signal, pid)
-        rescue
-          @logger.error("failed to send signal (#{signal}) to process (pid: #{pid}) [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def send_signal(pid, signal)
+      begin
+        @Process.kill(signal, pid)
+      rescue
+        @logger.error("failed to send signal (#{signal}) to process (pid: #{pid}) [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def wait(pid, flags=0)
-        begin
-          @Process.wait(pid, flags)
-        rescue
-          @logger.error("failed to wait(2) for process (pid: #{pid}) [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def wait(pid, flags=0)
+      begin
+        @Process.wait(pid, flags)
+      rescue
+        @logger.error("failed to wait(2) for process (pid: #{pid}) [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def pipe
-        begin
-          @IO.pipe
-        rescue
-          @logger.error("failed to pipe(2) [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def pipe
+      begin
+        @IO.pipe
+      rescue
+        @logger.error("failed to pipe(2) [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def fork
-        begin
-          @Process.fork{ yield }
-        rescue
-          @logger.error("failed to fork(2) [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def fork
+      begin
+        @Process.fork{ yield }
+      rescue
+        @logger.error("failed to fork(2) [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def gets(io)
-        begin
-          io.gets
-        rescue
-          @logger.error("failed to get line from #{io.inspect} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def gets(io)
+      begin
+        io.gets
+      rescue
+        @logger.error("failed to get line from #{io.inspect} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def close(io)
-        begin
-          io.close
-          io
-        rescue
-          @logger.error("failed to close(2) #{io.inspect} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def close(io)
+      begin
+        io.close
+        io
+      rescue
+        @logger.error("failed to close(2) #{io.inspect} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
+    end
 
-      def unlink(path)
-        begin
-          File.unlink(path)
-        rescue
-          @logger.error("failed to unlink(2): #{path} [#{$!} (#{$!.class})]")
-          @logger.debug($!) if @logger.debug?
-          nil
-        end
+    def unlink(path)
+      begin
+        File.unlink(path)
+      rescue
+        @logger.error("failed to unlink(2): #{path} [#{$!} (#{$!.class})]")
+        @logger.debug($!) if @logger.debug?
+        nil
       end
     end
+  end
 
+  class RootProcess
     include ServerSignal
 
     def initialize(logger, sockaddr_get, server_polling_interval_seconds, server_restart_overlap_seconds=0, euid=nil, egid=nil, &block) # :yields: socket_server
@@ -590,31 +600,31 @@ module Riser
   end
 
   module Daemon
-    include ServerSignal
-
-    def get_id(name, id_mod)    # :nodoc:
-      if (name) then
-        case (name)
-        when Integer
-          name
-        when /\A \d+ \z/x
-          name.to_i
-        else
-          id_mod.from_name(name)
+    class << self
+      def get_id(name, id_mod)
+        if (name) then
+          case (name)
+          when Integer
+            name
+          when /\A \d+ \z/x
+            name.to_i
+          else
+            id_mod.from_name(name)
+          end
         end
       end
-    end
-    module_function :get_id
+      private :get_id
 
-    def get_uid(user)
-      get_id(user, Process::UID)
-    end
-    module_function :get_uid
+      def get_uid(user)
+        get_id(user, Process::UID)
+      end
 
-    def get_gid(group)
-      get_id(group, Process::GID)
+      def get_gid(group)
+        get_id(group, Process::GID)
+      end
     end
-    module_function :get_gid
+
+    include ServerSignal
 
     DEFAULT = {
       daemonize: true,
@@ -637,6 +647,12 @@ module Riser
       signal_restart_forced:     SIGNAL_RESTART_FORCED
     }.freeze
 
+    # set the `status_file' parameter of the `start_daemon' method to
+    # call this method.
+    def self.running?(status_file_path)
+      StatusFile.locked? status_file_path
+    end
+
     # should be executed on the main thread sharing the stack with
     # signal(2) handlers
     def start_daemon(config, &block) # :yields: socket_server
@@ -675,8 +691,8 @@ module Riser
         sockaddr_get = proc{ c[:listen_address] }
       end
 
-      euid = get_uid(c[:server_privileged_user])
-      egid = get_gid(c[:server_privileged_group])
+      euid = Daemon.get_uid(c[:server_privileged_user])
+      egid = Daemon.get_gid(c[:server_privileged_group])
 
       root_process = RootProcess.new(logger, sockaddr_get, c[:server_polling_interval_seconds], c[:server_restart_overlap_seconds], euid, egid, &block)
       [ [ :signal_stop_graceful,      proc{ root_process.signal_stop_graceful }          ],
@@ -694,7 +710,7 @@ module Riser
       Signal.trap(:CHLD) { root_process.signal_server_down }
 
       if (c[:daemonize]) then
-        Process.daemon(c[:daemon_nochdir], true)
+        Process.daemon(c[:daemon_nochdir])
       end
 
       # update after process ID changes in daemonization.

data/lib/riser/stream.rb

@@ -81,29 +81,29 @@ module Riser
 
     def gets
       line = super
-      @logger.info("r #{line.inspect}")
+      @logger.info("r #{line.inspect}") if @logger.info?
       line
     end
 
     def read(size)
       data = super
-      @logger.info("r #{data.inspect}")
+      @logger.info("r #{data.inspect}") if @logger.info?
       data
     end
 
     def readpartial(maxlen, outbuf=nil)
       data = super
-      @logger.info("r #{data.inspect}")
+      @logger.info("r #{data.inspect}") if @logger.info?
       data
     end
 
     def write(message)
-      @logger.info("w #{message.inspect}")
+      @logger.info("w #{message.inspect}") if @logger.info?
       super
     end
 
     def close
-      @logger.info('close')
+      @logger.info('close') if @logger.info?
       super
     end
   end

data/lib/riser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - TOKI Yoshinori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-17 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler