Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 #134

Merged
merged 2 commits into from
Jul 20, 2018
Merged

修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 #134

merged 2 commits into from
Jul 20, 2018

Conversation

xiangjihan
Copy link
Contributor

@xiangjihan xiangjihan commented Jul 13, 2018 •
edited by inhere
Loading

使用swoole_process::kill代替posix_kill解决master没有完全退出的问题。同时将pid文件删除放在了服务停止成功之后执行。

fix: #123

xiangjihan and others added 2 commits July 13, 2018 11:39
@xiangjihan
修复执行php bin/swoft stop命令时master进程异常未退出的问题；
492e9aa 
修复执行php bin/swoft stop失败，但pid文件仍被删除的问题。
@inhere
Update AbstractServer.php
2730537
@xiangjihan
Copy link
Contributor Author

需不需要将所有进程管理的代码从posix迁移到swoole_process，对于swoole项目来说，swoole_process更为可靠。

@xiangjihan xiangjihan mentioned this pull request Jul 16, 2018
Closed
@inhere inhere merged commit 3abb03d into swoft-cloud:master Jul 20, 2018
huangzhhui added a commit that referenced this pull request Aug 7, 2018
@huangzhhui
Squashed 'src/framework/' changes from 2da84a5e..ba1657b8
1fab514 
ba1657b8 Upstream travis ci config (#160)
ffdb60e5 修复Json Validator会失效的BUG (#153)
4d788e9a 修复自定义注解无法使用Aop切面编程的BUG (#139)
405a83e3 Optimize  (#143)
b72e04ce 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
a30bf589 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (#137)
43088e60 Update PoolHelper.php (#131)
82aadc28 Scan bean according to Composer settings (#115)
5e55e722 Add psysh for debug (#109)
93c3ec76 Parse namespace to dir path according to composer settings (#103)

git-subtree-dir: src/framework
git-subtree-split: ba1657b85d5d5f1e846333e8f5ad03e499b76db8
huangzhhui added a commit that referenced this pull request Aug 8, 2018
@huangzhhui
Squashed 'src/http-server/' changes from f54584ce..4b3176b2
73e71e9 
4b3176b2 Upstream travis ci config (#160)
42be799f 修复Json Validator会失效的BUG (#153)
d1db1cf1 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
649e67a4 Validator增加Json格式支持 (#122)

git-subtree-dir: src/http-server
git-subtree-split: 4b3176b2d43dba4a3f7db5ad754c017ab1d8d294
swoft-bot added a commit that referenced this pull request Oct 15, 2018
@swoft-bot
Squashed 'src/websocket-server/' changes from d614189..a463143
27d4bbd 
a463143 fix: ws server push method param is error (#186)
a8a91ad Upstream travis ci config (#160)
b6a8e59 修复Json Validator会失效的BUG (#153)
93113b0 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)

git-subtree-dir: src/websocket-server
git-subtree-split: a46314397916c28553ffff73c61985e0e2635ebd
swoft-bot added a commit that referenced this pull request Oct 15, 2018
@swoft-bot
Squashed 'src/rpc-server/' changes from 5622a9c..525b92e
f3c57fb 
525b92e Upstream some components travis ci config (#161)
ddc5acb 修复Json Validator会失效的BUG (#153)
77f265c 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
37026e2 fix spelling (#120)
197a91e  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50 add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
huangzhhui added a commit that referenced this pull request Nov 21, 2018
@huangzhhui
Squashed 'src/rpc-server/' changes from 5622a9ca..525b92ec
4e00016 
525b92ec Upstream some components travis ci config (#161)
ddc5acb3 修复Json Validator会失效的BUG (#153)
77f265cc 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
37026e27 fix spelling (#120)
197a91e4  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50d add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
swoft-bot pushed a commit that referenced this pull request Dec 7, 2018
@limingxinleo @swoft-bot
Merge master to feature (#247)
932f8b5 
* Squashed 'src/task/' changes from e9d76eb8..548e9972

548e9972 Upstream travis ci config (#160)
32c35b45 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/task
git-subtree-split: 548e9972be65dfed59a03fdb4d440926d6428980

* Squashed 'src/session/' changes from e2bc8e6b..be17b6c9

be17b6c9 Upstream travis ci config (#160)
2ce1e066 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/session
git-subtree-split: be17b6c93b5194eefbc9615f636276fb45a93809

* Squashed 'src/rpc-server/' changes from 5622a9ca..525b92ec

525b92ec Upstream some components travis ci config (#161)
ddc5acb3 修复Json Validator会失效的BUG (#153)
77f265cc 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
37026e27 fix spelling (#120)
197a91e4  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50d add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad

* Squashed 'src/console/' changes from 1f3d3cc8..d906edb9

d906edb9  add coWrite(); use swoft/swoole-ide-helper (#83)
ea46275d new: add timezone setting. fix some bug for Config

git-subtree-dir: src/console
git-subtree-split: d906edb91f3d59a75498547def0300b7643f44fa

* Squashed 'src/auth/' changes from c9bc8780..5aba2468

5aba2468 Upstream travis ci config (#160)
48090748 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/auth
git-subtree-split: 5aba2468da04021789a2355a15d275926021a57b

* fix: Temporary fix the data confusion in SessionMiddleware (#229)

Fix bug about $sessionStore that has data confusion between same worker.

* fix: Fix Auth token cache time (#223)

* composer update

* fix #419 token cache time is incorrect.

* update composer

* feat: Added exclusive lock and shared lock (#225)

* feat: 为查询构造器添加排他锁和共享锁操作方法

* feat: 为活动记录AR添加排他锁和共享锁操作参数

* feat: 为查询构造器和活动记录AR中的加锁操作添加单元测试

* Optimized coding style and Fixed unit test.

* Optimized coding style and Fixed unit test

* 修复 zRem 前缀问题 (#232)

zRem 对应的 zDelete 无映射前缀方法

* fix: Fixed Session is accidentally replaced by the next request. (#234)

* Fix Session is accidentally replaced by the next request.

* Add Unit Test

* Update Unit Test

* Delete deprecated session

* Modify session context key

* fix scope usage error (#236)

* Fixed Session Unit (#235)

* FIxed BUG for incorrect result of Redis::HMget and Redis::HGetAll. (#239)

* fix: Fixed after the server is restarted, the client fails to receive the package. (#237)

* 增加服务重启后，RpcClient recv会失败的单测

* client->receive失败时，若错误码为5001，则重连并且重新发送

* 修改RPC收包失败，重试逻辑

* Update

* Update

* 增加日志

* Fix log

* 如果客户端正常返回数据，不需要关闭客户端

* 修改日志级别

* Fix 104 Connection reset by peer

* RPC 客户端意外关闭后，记录对应日志

* fix http-client Exception (#238)

* optimize: Optimize Server Request initialization. (#240)

* Optimize Server Request initialization.

* Update Request.php

* fix: Fixed rpc client log message for exception (#241)

* fix: Fixed rpc client exception

* Changed swoole version 4.0.2 -> 4.0.3

* fix: Fixed REDIS_DB is not effected when redis reconnected. (#242)

* Fixed REDIS_DB is not effected when redis reconnected.

* 修改切换DB操作统一在createConnection中进行

* 增加重连后，REDIS_DB会失效的BUG

* fix: Fixed unit test (#227)

* Fixed unit test

Since #209, the result that get via QueryBuilder will not format the data type anymore.

* Update BugTest.php

* feat: Added Redis HyperLogLog (#226)

* 增加pfAdd、pfCount、pfMerge方法单测

* Update pfadd pfcount pfmerge

* 完善 Redis HyperLogLog

* Add Redis::ZInter

* Swoole 4.2.6以后版本，协程Redis blpop timeout失效
swoft-bot added a commit that referenced this pull request Jan 15, 2019
@swoft-bot
Squashed 'src/framework/' changes from b3a45be..f9910dc
9b5c5f9 
f9910dc Merge commit 'b4f8d0a17a1c9a99274d0e250f6179d14a8728a8'
036d98b Merge branch 'master' of github.com:swoft-cloud/swoft-component
0d9ccbe Update Aop.php (#222)
cacd775 修复Number验证器最大和最小的template没有生效的问题 (#218)
7ebaf5f 修复Number验证器最大和最小的template没有生效的问题 (#218)
ed18988 fix error on trigger event handler (#196)
bf188ad fix a bug when warnings appear in the high version of swoole (#195)
4ec3be6 自定义组件支持别名配置 (#181)
609dd83 修复restart不能正常使用的BUG (#180)
0bcd9bc 修改连接池配置的timeout字段为float (#177)
0044361 修改自定义组件只能扫描Aop、Command、Bootstrap三个文件的BUG (#169)
99916fc 兼容swoole 4.0.3版本 (#166)
a1d6ace 增加用户自定义组件配置 (#150)
d0f7f88 Upstream travis ci config (#160)
afb115f 修复Json Validator会失效的BUG (#153)
5fdf6c7 修复自定义注解无法使用Aop切面编程的BUG (#139)
3c147d1 Optimize  (#143)
c98825b 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (#134)
940f76f 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (#137)
427dcb6 Update PoolHelper.php (#131)
fc38546 Scan bean according to Composer settings (#115)
851f3f0 Add psysh for debug (#109)
e55fae5 Parse namespace to dir path according to composer settings (#103)
290a2f4 fix swoft-cloud/swoft#277 (#96)
0d2dade  fix logWriter (#95)
1f1af6c Uniform log path format (#94)
148daeb [fixed]eval error with void method (#92)
a22481a [fixed] logger->messages init error (#91)
69975cd  add coWrite(); use swoft/swoole-ide-helper (#83)
7f66cef change fix
410b028 fix index err

git-subtree-dir: src/framework
git-subtree-split: f9910dc9266e9f87c158d89286a2f07dc67f2a18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@huangzhhui huangzhhui huangzhhui approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

restart的疑问
3 participants
@xiangjihan @huangzhhui @inhere