Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rubygem-serverengine for
openSUSE:Factory checked in at 2021-01-21 21:56:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-serverengine (Old)
and /work/SRC/openSUSE:Factory/.rubygem-serverengine.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-serverengine"
Thu Jan 21 21:56:21 2021 rev:8 rq:865228 version:2.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-serverengine/rubygem-serverengine.changes
2020-03-07 21:39:58.676342617 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-serverengine.new.28504/rubygem-serverengine.changes
2021-01-21 21:56:22.673836667 +0100
@@ -1,0 +2,11 @@
+Wed Jan 20 13:22:36 UTC 2021 - Stephan Kulow <[email protected]>
+
+updated to version 2.2.2
+ see installed Changelog
+
+ 2020-11-02 version 2.2.2:
+
+ * Fix incomplete Windows support in spawn based multi worker
+
+
+-------------------------------------------------------------------
Old:
----
serverengine-2.2.1.gem
New:
----
serverengine-2.2.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-serverengine.spec ++++++
--- /var/tmp/diff_new_pack.mdfcXg/_old 2021-01-21 21:56:23.637837142 +0100
+++ /var/tmp/diff_new_pack.mdfcXg/_new 2021-01-21 21:56:23.641837144 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-serverengine
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-serverengine
-Version: 2.2.1
+Version: 2.2.2
Release: 0
%define mod_name serverengine
%define mod_full_name %{mod_name}-%{version}
++++++ serverengine-2.2.1.gem -> serverengine-2.2.2.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.travis.yml new/.travis.yml
--- old/.travis.yml 2020-01-24 07:55:38.000000000 +0100
+++ new/.travis.yml 2020-11-02 07:46:00.000000000 +0100
@@ -4,8 +4,10 @@
- 2.1.10
- 2.2.9
- 2.3.8
- - 2.4.5
- - 2.5.3
+ - 2.4.9
+ - 2.5.7
+ - 2.6.5
+ - 2.7.0
- ruby-head
branches:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Changelog new/Changelog
--- old/Changelog 2020-01-24 07:55:38.000000000 +0100
+++ new/Changelog 2020-11-02 07:46:00.000000000 +0100
@@ -1,3 +1,7 @@
+2020-11-02 version 2.2.2:
+
+* Fix incomplete Windows support in spawn based multi worker
+
2020-01-24 version 2.2.1:
* Fix IPv6 dual-stack mode issue for UDP
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/serverengine/multi_process_server.rb
new/lib/serverengine/multi_process_server.rb
--- old/lib/serverengine/multi_process_server.rb 2020-01-24
07:55:38.000000000 +0100
+++ new/lib/serverengine/multi_process_server.rb 2020-11-02
07:46:00.000000000 +0100
@@ -120,10 +120,19 @@
end
def send_reload
- @pmon.send_signal(@reload_signal) if @pmon
+ return nil unless @pmon
+ if @pmon.command_sender_pipe
+ send_command("RELOAD\n")
+ else
+ @pmon.send_signal(@reload_signal)
+ end
nil
end
+ def send_command(command)
+ @pmon.send_command(command) if @pmon
+ end
+
def join
@pmon.join if @pmon
nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/serverengine/multi_spawn_server.rb
new/lib/serverengine/multi_spawn_server.rb
--- old/lib/serverengine/multi_spawn_server.rb 2020-01-24 07:55:38.000000000
+0100
+++ new/lib/serverengine/multi_spawn_server.rb 2020-11-02 07:46:00.000000000
+0100
@@ -46,13 +46,6 @@
@pm.command_sender = @command_sender
end
- def stop(stop_graceful)
- if @command_sender == "pipe"
- @pm.command_sender_pipe.write(stop_graceful ? "GRACEFUL_STOP\n" :
"IMMEDIATE_STOP\n")
- end
- super
- end
-
def run
super
ensure
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/serverengine/process_manager.rb
new/lib/serverengine/process_manager.rb
--- old/lib/serverengine/process_manager.rb 2020-01-24 07:55:38.000000000
+0100
+++ new/lib/serverengine/process_manager.rb 2020-11-02 07:46:00.000000000
+0100
@@ -71,7 +71,6 @@
attr_reader :enable_heartbeat, :auto_heartbeat
attr_accessor :command_sender
- attr_reader :command_sender_pipe
CONFIG_PARAMS = {
heartbeat_interval: 1,
@@ -180,10 +179,11 @@
end
end
+ command_sender_pipe = nil
if @command_sender == "pipe"
- inpipe, @command_sender_pipe = IO.pipe
- @command_sender_pipe.sync = true
- @command_sender_pipe.binmode
+ inpipe, command_sender_pipe = IO.pipe
+ command_sender_pipe.sync = true
+ command_sender_pipe.binmode
options[:in] = inpipe
end
env['SERVERENGINE_SOCKETMANAGER_INTERNAL_TOKEN'] =
SocketManager::INTERNAL_TOKEN
@@ -193,6 +193,7 @@
end
m = Monitor.new(pid, monitor_options)
+ m.command_sender_pipe = command_sender_pipe
@monitors << m
@@ -307,9 +308,11 @@
@graceful_kill_start_time = nil
@immediate_kill_start_time = nil
@kill_count = 0
+
+ @command_sender_pipe = nil
end
- attr_accessor :last_heartbeat_time
+ attr_accessor :last_heartbeat_time, :command_sender_pipe
attr_reader :pid
def heartbeat_delay
@@ -329,6 +332,10 @@
end
end
+ def send_command(command)
+ @command_sender_pipe.write(command) if @command_sender_pipe
+ end
+
def try_join
pid = @pid
return true unless pid
@@ -366,15 +373,25 @@
end
def start_graceful_stop!
- now = Time.now
- @next_kill_time ||= now
- @graceful_kill_start_time ||= now
+ if ServerEngine.windows?
+ # heartbeat isn't supported on Windows
+ send_command("GRACEFUL_STOP\n")
+ else
+ now = Time.now
+ @next_kill_time ||= now
+ @graceful_kill_start_time ||= now
+ end
end
def start_immediate_stop!
- now = Time.now
- @next_kill_time ||= now
- @immediate_kill_start_time ||= now
+ if ServerEngine.windows?
+ # heartbeat isn't supported on Windows
+ system("taskkill /f /pid #{@pid}")
+ else
+ now = Time.now
+ @next_kill_time ||= now
+ @immediate_kill_start_time ||= now
+ end
end
def tick(now=Time.now)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/serverengine/version.rb
new/lib/serverengine/version.rb
--- old/lib/serverengine/version.rb 2020-01-24 07:55:38.000000000 +0100
+++ new/lib/serverengine/version.rb 2020-11-02 07:46:00.000000000 +0100
@@ -1,3 +1,3 @@
module ServerEngine
- VERSION = "2.2.1"
+ VERSION = "2.2.2"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2020-01-24 07:55:38.000000000 +0100
+++ new/metadata 2020-11-02 07:46:00.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: serverengine
version: !ruby/object:Gem::Version
- version: 2.2.1
+ version: 2.2.2
platform: ruby
authors:
- Sadayuki Furuhashi
autorequire:
bindir: bin
cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: sigdump
