From b69d850757a7a8c4ff9a368df004a3cfaaf9f1e4 Mon Sep 17 00:00:00 2001 From: Zhaoxing Date: Thu, 8 Sep 2016 23:20:06 +0800 Subject: Issue-id: OCS-9 Change-Id: I73c18bdda656c43687810930338f9a949ed08848 Signed-off-by: Zhaoxing --- .../src/assembly/resources/redis/BGREWRITEAOF.bat | 86 ++++++++++--------- .../src/assembly/resources/redis/BGREWRITEAOF.sh | 8 +- .../src/assembly/resources/redis/redisService.xml | 44 +++++++--- .../redis-ext/src/assembly/resources/redis/run.bat | 98 +++++++++++----------- .../redis-ext/src/assembly/resources/redis/run.sh | 8 +- .../src/assembly/resources/redis/run4docker.sh | 30 ------- .../src/assembly/resources/redis/stop.bat | 86 ++++++++++--------- .../redis-ext/src/assembly/resources/redis/stop.sh | 8 +- 8 files changed, 191 insertions(+), 177 deletions(-) delete mode 100644 msb-core/redis-ext/src/assembly/resources/redis/run4docker.sh (limited to 'msb-core/redis-ext/src') diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat index b391f28..718d756 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.bat @@ -1,41 +1,45 @@ -@REM -@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM -@echo off -title close redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCLIENT=%DIRNAME%redis-cli.exe - - -echo ================Redis config info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script rewrite the AOF file in the background！ -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCLIENT% -p 6379 BGREWRITEAOF" -%_REDISCLIENT% -p 6379 BGREWRITEAOF -echo closing signal has been sent,stopping in background,WAIT... -timeout /t 2 /nobreak > nul -exit +@REM +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. +@REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + +@echo off +title close redis-server +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=. + +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% + +set HOME=%DIRNAME% +set _REDISCLIENT=%DIRNAME%redis-cli.exe + + +echo ================Redis config info ============================================= +echo Redis_HOME=$HOME +echo TIP:This shell script rewrite the AOF file in the background！ +echo =============================================================================== + + +cd /d "%HOME%" +echo @WORK_DIR@%HOME% +echo @C_CMD@ "%_REDISCLIENT% -p 6379 BGREWRITEAOF" +%_REDISCLIENT% -p 6379 BGREWRITEAOF +echo closing signal has been sent,stopping in background,WAIT... +timeout /t 2 /nobreak > nul +exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh index e401021..3b92d26 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/BGREWRITEAOF.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# + DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` _REDISCLIENT="$HOME/redis-cli" diff --git a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml b/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml index 2083a69..cd85369 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml +++ b/msb-core/redis-ext/src/assembly/resources/redis/redisService.xml @@ -1,13 +1,33 @@ - - msb_redis - msb_redis - This service runs redis. - %BASE% - - redis-server.exe - redis.conf - redis-cli.exe - shutdown - rotate - + + + msb_redis + msb_redis + This service runs redis. + %BASE% + + redis-server.exe + redis.conf + redis-cli.exe + shutdown + rotate + \ No newline at end of file diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.bat b/msb-core/redis-ext/src/assembly/resources/redis/run.bat index ad443ed..f62f110 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/run.bat @@ -1,47 +1,51 @@ -@REM -@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM -@echo off -title redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCMD=%DIRNAME%redis-server.exe -set _REDISCONF=%DIRNAME%redis.conf - - -echo ================Redis config info ============================================= -echo Redis_HOME=%HOME% -echo config file=$_REDISCONF -echo Help:use $_REDISCMD --help for help -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCMD% %_REDISCONF%" -%_REDISCMD% %_REDISCONF% -IF ERRORLEVEL 1 goto showerror -exit -:showerror -echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check! -echo After checking, press any key to close -pause -exit +@REM +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. +@REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + +@echo off +title redis-server +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=. + +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% + +set HOME=%DIRNAME% +set _REDISCMD=%DIRNAME%redis-server.exe +set _REDISCONF=%DIRNAME%redis.conf + + +echo ================Redis config info ============================================= +echo Redis_HOME=%HOME% +echo config file=$_REDISCONF +echo Help:use $_REDISCMD --help for help +echo =============================================================================== + + +cd /d "%HOME%" +echo @WORK_DIR@%HOME% +echo @C_CMD@ "%_REDISCMD% %_REDISCONF%" +%_REDISCMD% %_REDISCONF% +IF ERRORLEVEL 1 goto showerror +exit +:showerror +echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check! +echo After checking, press any key to close +pause +exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run.sh b/msb-core/redis-ext/src/assembly/resources/redis/run.sh index c20798d..09bfddc 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/run.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/run.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# + DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` _REDISCMD="$HOME/redis-server" diff --git a/msb-core/redis-ext/src/assembly/resources/redis/run4docker.sh b/msb-core/redis-ext/src/assembly/resources/redis/run4docker.sh deleted file mode 100644 index 5640a62..0000000 --- a/msb-core/redis-ext/src/assembly/resources/redis/run4docker.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -_REDISCMD="$HOME/redis-server" -_REDISCONF="$HOME/redis.conf" - -echo =========== Redis config info ============================================= -echo Redis_HOME=$HOME -echo config file=$_REDISCONF -echo Help:use $_REDISCMD --help for help -echo =============================================================================== -cd $HOME; pwd - -echo @C_CMD@ $_REDISCMD $_REDISCONF --daemonize no -$_REDISCMD $_REDISCONF --daemonize no diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat b/msb-core/redis-ext/src/assembly/resources/redis/stop.bat index de4db69..32da2f0 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.bat +++ b/msb-core/redis-ext/src/assembly/resources/redis/stop.bat @@ -1,41 +1,45 @@ -@REM -@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM -@echo off -title close redis-server -@if not "%ECHO%" == "" echo %ECHO% -@if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=. - -if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% - -set HOME=%DIRNAME% -set _REDISCLIENT=%DIRNAME%redis-cli.exe - - -echo ================Redis config info ============================================= -echo Redis_HOME=$HOME -echo TIP:This shell script close the Redis instance listening on 6379! -echo =============================================================================== - - -cd /d "%HOME%" -echo @WORK_DIR@%HOME% -echo @C_CMD@ "%_REDISCLIENT% -p 6379 shutdown" -%_REDISCLIENT% -p 6379 shutdown -echo closing signal has been sent,stopping in background,WAIT... -timeout /t 2 /nobreak > nul -exit +@REM +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. +@REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + +@echo off +title close redis-server +@if not "%ECHO%" == "" echo %ECHO% +@if "%OS%" == "Windows_NT" setlocal + +set DIRNAME=. + +if "%OS%" == "Windows_NT" set DIRNAME=%~dp0% + +set HOME=%DIRNAME% +set _REDISCLIENT=%DIRNAME%redis-cli.exe + + +echo ================Redis config info ============================================= +echo Redis_HOME=$HOME +echo TIP:This shell script close the Redis instance listening on 6379! +echo =============================================================================== + + +cd /d "%HOME%" +echo @WORK_DIR@%HOME% +echo @C_CMD@ "%_REDISCLIENT% -p 6379 shutdown" +%_REDISCLIENT% -p 6379 shutdown +echo closing signal has been sent,stopping in background,WAIT... +timeout /t 2 /nobreak > nul +exit diff --git a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh b/msb-core/redis-ext/src/assembly/resources/redis/stop.sh index 4100b04..7ae204c 100644 --- a/msb-core/redis-ext/src/assembly/resources/redis/stop.sh +++ b/msb-core/redis-ext/src/assembly/resources/redis/stop.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# + DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` _REDISCLIENT="$HOME/redis-cli" -- cgit 1.2.3-korg