serverengine 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debb8b7610180c5b0980d3ff75235e924503ebb4
-  data.tar.gz: bd1f53485fd632906589b85c94f13d554fa3d652
+  metadata.gz: ac02dfbbdf4f05336522f09c88857a122c35821d
+  data.tar.gz: 6ec1e772952f738b8d17e93d15788e934ffcf665
 SHA512:
-  metadata.gz: 0e5097035cea3dfaf166bd5a1eea304feb5c364368616ee58c8140613adc6a0155c1ecd0d4f6c09991425fc9f5fa5b446c81d239ed72ed11cd30af5f2e6f69c4
-  data.tar.gz: d6de17641b8cc2d3c64ca1cc21cc6e9968065071077d4adbb68658e3c397f66a637828ce350d72d5b65e74d339014b93ba8972eb5dae42894cf055602ee44c58
+  metadata.gz: 831d6e39b2cfd52d25c6cf39d2aba188f29767b21d203d2f8ee22cf945c44750f9617d382b9db6eab58d902c366c3d03761b420a4aed270cb32d1db2683555c9
+  data.tar.gz: b619fb4e206c79bf70c91950950d62c9fe64deb18014016ca959c0bda60bf99442beda9ef07ab2a1931b832333304f4da1ad2cc445dc2574299cf928579f97a3

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.2
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
 
 branches:
   only:
@@ -11,3 +13,7 @@ script: bundle exec rake spec
 
 before_install:
  - gem update bundler
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Changelog

@@ -1,3 +1,9 @@
+2016-04-14 version 1.6.2:
+
+* Fix to use Etc instead of id command in change_privilege for windows
+* Fix signal handler on Server class to be configurable
+* Fix to use spawn when damonize on windows
+
 2016-03-04 version 1.6.1:
 
 * Fix CloseHandle definition in winsock

data/README.md

@@ -345,7 +345,7 @@ se.run
 ```ruby
 module MyServer
   def before_run
-    @socket_manager_path = ServerEngine::SocketManager.generate_path
+    @socket_manager_path = ServerEngine::SocketManager::Server.generate_path
     @socket_manager_server = ServerEngine::SocketManager::Server.open(@socket_manager_path)
   end
 

data/lib/serverengine/daemon.rb

@@ -62,27 +62,36 @@ module ServerEngine
       DUMP = :CONT
     end
 
-    def self.change_privilege(user, group)
-      if group
-        chgid = group.to_i
-        if chgid.to_s != group
-          chgid = Process::GID.from_name(group)
-        end
-        Process::GID.change_privilege(chgid)
+    def self.get_etc_passwd(user)
+      if user.to_i.to_s == user
+        Etc.getpwuid(user.to_i)
+      else
+        Etc.getpwnam(user)
       end
+    end
 
+    def self.get_etc_group(group)
+      if group.to_i.to_s == group
+        Etc.getgrgid(group.to_i)
+      else
+        Etc.getgrnam(group)
+      end
+    end
+
+    def self.change_privilege(user, group)
       if user
-        chuid = user.to_i
-        if chuid.to_s != user
-          chuid = Process::UID.from_name(user)
-        end
+        etc_pw = Daemon.get_etc_passwd(user)
+        user_groups = [etc_pw.gid]
+        Etc.setgrent
+        Etc.group { |gr| user_groups << gr.gid if gr.mem.include?(etc_pw.name) } # emulate 'id -G'
 
-        user_groups = `id -G #{Shellwords.escape user}`.split.map(&:to_i)
-        if $?.success?
-          Process.groups = Process.groups | user_groups
-        end
+        Process.groups = Process.groups | user_groups
+        Process::UID.change_privilege(etc_pw.uid)
+      end
 
-        Process::UID.change_privilege(chuid)
+      if group
+        etc_group = Daemon.get_etc_group(group)
+        Process::GID.change_privilege(etc_group.gid)
       end
 
       nil
@@ -97,6 +106,27 @@ module ServerEngine
       end
     end
 
+    def self.run_server(server_module, worker_module, load_config_proc={}, &block)
+      Daemon.new(server_module, worker_module, load_config_proc, &block).server_main
+    end
+
+    def server_main
+      $0 = @daemon_process_name if @daemon_process_name
+
+      Daemon.change_privilege(@chuser, @chgroup)
+      File.umask(@chumask) if @chumask
+
+      s = create_server(create_logger)
+
+      STDIN.reopen(File::NULL)
+      STDOUT.reopen(File::NULL, "wb")
+      STDERR.reopen(File::NULL, "wb")
+
+      s.install_signal_handlers
+
+      s.main
+    end
+
     def main
       unless @daemonize
         s = create_server(create_logger)
@@ -105,53 +135,62 @@ module ServerEngine
         return 0
       end
 
-      rpipe, wpipe = IO.pipe
-      wpipe.sync = true
+      rpipe = nil
+      if ServerEngine.windows?
+        windows_daemon_cmdline = config[:windows_daemon_cmdline]
+        pid = Process.spawn(*Array(windows_daemon_cmdline))
+      else
+        rpipe, wpipe = IO.pipe
+        wpipe.sync = true
 
-      Process.fork do
-        begin
-          rpipe.close
+        Process.fork do
+          begin
+            rpipe.close
 
-          Process.setsid
-          Process.fork do
-            $0 = @daemon_process_name if @daemon_process_name
-            wpipe.write "#{Process.pid}\n"
+            Process.setsid
+            Process.fork do
+              $0 = @daemon_process_name if @daemon_process_name
+              wpipe.write "#{Process.pid}\n"
 
-            Daemon.change_privilege(@chuser, @chgroup)
-            File.umask(@chumask) if @chumask
+              Daemon.change_privilege(@chuser, @chgroup)
+              File.umask(@chumask) if @chumask
 
-            s = create_server(create_logger)
+              s = create_server(create_logger)
 
-            STDIN.reopen(File::NULL)
-            STDOUT.reopen(File::NULL, "wb")
-            STDERR.reopen(File::NULL, "wb")
+              STDIN.reopen(File::NULL)
+              STDOUT.reopen(File::NULL, "wb")
+              STDERR.reopen(File::NULL, "wb")
 
-            s.install_signal_handlers
+              s.install_signal_handlers
 
-            wpipe.write "\n"
-            wpipe.close
+              wpipe.write "\n"
+              wpipe.close
 
-            s.main
-          end
+              s.main
+            end
 
-          exit 0
-        ensure
-          exit! @daemonize_error_exit_code
+            exit 0
+          ensure
+            exit! @daemonize_error_exit_code
+          end
         end
-      end
 
-      wpipe.close
+        wpipe.close
+
+        pid = rpipe.gets.to_i
+      end
 
-      pid = rpipe.gets.to_i
       if @pid_path
         File.open(@pid_path, "w") {|f|
           f.write "#{pid}\n"
         }
       end
 
-      data = rpipe.read
-      if data != "\n"
-        return @daemonize_error_exit_code
+      unless ServerEngine.windows?
+        data = rpipe.read
+        if data != "\n"
+          return @daemonize_error_exit_code
+        end
       end
 
       return 0

data/lib/serverengine/server.rb

@@ -65,16 +65,16 @@ module ServerEngine
     def install_signal_handlers
       s = self
       SignalThread.new do |st|
-        st.trap(Daemon::Signals::GRACEFUL_STOP) { s.stop(true) }
-        st.trap(Daemon::Signals::DETACH) { s.stop(true) }
+        st.trap(@config[:signal_graceful_stop] || Daemon::Signals::GRACEFUL_STOP) { s.stop(true) }
+        st.trap(@config[:signal_detach] || Daemon::Signals::DETACH) { s.stop(true) }
         # Here disables signals excepting GRACEFUL_STOP == :SIGTERM because
         # only SIGTERM is available on all version of Windows.
         unless ServerEngine.windows?
-          st.trap(Daemon::Signals::IMMEDIATE_STOP) { s.stop(false) }
-          st.trap(Daemon::Signals::GRACEFUL_RESTART) { s.restart(true) }
-          st.trap(Daemon::Signals::IMMEDIATE_RESTART) { s.restart(false) }
-          st.trap(Daemon::Signals::RELOAD) { s.reload }
-          st.trap(Daemon::Signals::DUMP) { Sigdump.dump }
+          st.trap(@config[:signal_immediate_stop] || Daemon::Signals::IMMEDIATE_STOP) { s.stop(false) }
+          st.trap(@config[:signal_graceful_restart] || Daemon::Signals::GRACEFUL_RESTART) { s.restart(true) }
+          st.trap(@config[:signal_immediate_restart] || Daemon::Signals::IMMEDIATE_RESTART) { s.restart(false) }
+          st.trap(@config[:signal_reload] || Daemon::Signals::RELOAD) { s.reload }
+          st.trap(@config[:signal_dump] || Daemon::Signals::DUMP) { Sigdump.dump }
         end
       end
     end

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/lib/serverengine.rb

@@ -51,4 +51,14 @@ module ServerEngine
   def self.create(server_module, worker_module, load_config_proc={}, &block)
     Daemon.new(server_module, worker_module, load_config_proc, &block)
   end
+
+  def self.ruby_bin_path
+    if ServerEngine.windows?
+      ruby_path = "\0" * 256
+      GetModuleFileName.call(0, ruby_path, 256)
+      return ruby_path.rstrip.gsub(/\\/, '/')
+    else
+      return File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["RUBY_INSTALL_NAME"]) + RbConfig::CONFIG["EXEEXT"]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ServerEngine - multiprocess server framework