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

fix stop.sh execute failed in macos (#3187) #3188

Merged
merged 26 commits into from
Apr 3, 2022
Merged

fix stop.sh execute failed in macos (#3187) #3188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3ea6b24
optimize start.sh ,support different jdk configure JAVA_OPTS parameter
IceFoxs Nov 18, 2021
bffe390
fix start.bat ,support different JDK work and logs dir
IceFoxs Nov 18, 2021
6912fa2
Update start.bat
IceFoxs Nov 18, 2021
f64dc1b
Merge branch 'apache:master' into master
IceFoxs Nov 19, 2021
da94ed6
Merge branch 'apache:master' into master
IceFoxs Jan 4, 2022
658db3e
Merge branch 'apache:master' into master
IceFoxs Jan 26, 2022
cf002c9
fix start.bat(ISSUE#2814)
IceFoxs Jan 26, 2022
b4d208d
Merge branch 'apache:master' into master
IceFoxs Jan 26, 2022
513429f
Revert "fix start.bat(ISSUE#2814)"
IceFoxs Jan 27, 2022
2511d7f
Merge branch 'master' of https://github.com/IceFoxs/incubator-shenyu
IceFoxs Jan 27, 2022
6be8b00
fix start.bat (Issue #2814)
IceFoxs Jan 27, 2022
bd0bd3a
Update start.bat
IceFoxs Jan 27, 2022
76df2cf
Merge branch 'apache:master' into master
IceFoxs Jan 27, 2022
18aa39a
Merge branch 'apache:master' into master
IceFoxs Jan 27, 2022
4c3d455
Merge branch 'apache:master' into master
IceFoxs Feb 9, 2022
2d60984
Merge branch 'apache:master' into master
IceFoxs Mar 3, 2022
c90f3bc
Merge branch 'apache:master' into master
IceFoxs Mar 8, 2022
1ddb0cc
Merge branch 'apache:master' into master
IceFoxs Mar 23, 2022
7bb73c3
Merge branch 'apache:master' into master
IceFoxs Mar 24, 2022
7da233e
Merge branch 'apache:master' into master
IceFoxs Mar 31, 2022
624a43e
Merge branch 'apache:master' into master
IceFoxs Apr 2, 2022
16c4958
Merge branch 'apache:master' into master
IceFoxs Apr 2, 2022
562d733
fix stop.sh exxcute failed in macos
IceFoxs Apr 2, 2022
bc7b58f
Merge branch 'master' of https://github.com/IceFoxs/incubator-shenyu
IceFoxs Apr 2, 2022
5ecc78c
fix stop.sh execute failed in macos (#3187)
IceFoxs Apr 2, 2022
a4934b9
fix stop.sh execute failed in macos (#3187)
IceFoxs Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-admin-dist/src/main/resources/bin/stop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd `dirname $0`
cd ..
DEPLOY_DIR=`pwd`

PIDS=`ps -eo pid,cmd |grep -v tail|grep -v grep|grep "$DEPLOY_DIR"|awk '{print $1}'`
PIDS=`ps ax |grep -v tail|grep -v grep|grep "$DEPLOY_DIR"|awk '{print $1}'`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

support linux？

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I already verified it in ubuntu and centos.

image

if [ -z "$PIDS" ]; then
echo "ERROR: The $SERVER_NAME does not started!"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-bootstrap-dist/src/main/resources/bin/stop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cd `dirname $0`
cd ..
DEPLOY_DIR=`pwd`

PIDS=`ps -eo pid,cmd |grep -v tail|grep -v grep|grep "$DEPLOY_DIR"|awk '{print $1}'`
PIDS=`ps ax |grep -v tail|grep -v grep|grep "$DEPLOY_DIR"|awk '{print $1}'`
if [ -z "$PIDS" ]; then
echo "ERROR: The $SERVER_NAME does not started!"
exit 1
Expand Down