zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ server ] [ executor ] - redis stream listener container all procedure -1

Browse Source
This commit is contained in:
zeaslity
2022-12-30 15:30:12 +08:00
parent adc78fa666
commit a4a6c84fd8
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/io/wdd/rpc/execute/result/CreateStreamReader.java
View File

@@ -38,6 +38,12 @@ public class CreateStreamReader implements ApplicationContextAware {
// prepare the environment // prepare the environment
prepareEnv(); prepareEnv();
// oldStreamKey equals streamKey don't need to do anything , just return
if (redisStreamReaderConfig.getStreamKey().equals(streamKey)) {
log.debug("redis listener container not change !");
return;
}
// destroy the REDIS_STREAM_LISTENER_CONTAINER // destroy the REDIS_STREAM_LISTENER_CONTAINER
destroyStreamReader(streamKey); destroyStreamReader(streamKey);

9
source/src/main/java/io/wdd/source/shell/agent-bootup.sh
View File

@@ -13,7 +13,6 @@ DependLibFiles=(
wdd-lib-sys.sh wdd-lib-sys.sh
) )
OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/ OctopusAgentUrl=https://happybirthday.107421.xyz/octopus-agent/
RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell
@@ -216,7 +215,6 @@ DownloadAllFile() {
. ./lib/wdd-lib-os.sh . ./lib/wdd-lib-os.sh
CheckAndDownloadLatestVersion CheckAndDownloadLatestVersion
FunctionSuccess FunctionSuccess
FunctionEnd FunctionEnd
@@ -230,11 +228,6 @@ ModifySystemConfig(){
## 配置内核参数 ## 配置内核参数
cat >/etc/sysctl.d/k8s.conf <<EOF cat >/etc/sysctl.d/k8s.conf <<EOF
net.ipv4.ip_forward = 1 net.ipv4.ip_forward = 1
net.bridge.bridge-nf-call-ip6tables = 1
net.bridge.bridge-nf-call-iptables = 1
net.ipv6.conf.all.disable_ipv6 = 1
net.ipv6.conf.default.disable_ipv6 = 1
net.ipv6.conf.lo.disable_ipv6 = 1
net.ipv6.conf.all.forwarding = 1 net.ipv6.conf.all.forwarding = 1
EOF EOF
@@ -343,7 +336,7 @@ BootUPAgent(){
chmod +x $OctopusAgentPath/lib/wdd-lib-env.sh chmod +x $OctopusAgentPath/lib/wdd-lib-env.sh
$OctopusAgentPath/lib/wdd-lib-env.sh $OctopusAgentPath/lib/wdd-lib-env.sh
colorEcho $BLUE "start to daemon the agent pid" colorEcho $BLUE "start to daemon the octopus agent"
systemdAgent systemdAgent
colorEcho $BLUE "start the agent!" colorEcho $BLUE "start the agent!"

2
source/src/main/java/io/wdd/source/shell/agent-restart.sh
View File

@@ -5,7 +5,7 @@
. /octopus-agent/shell/lib/wdd-lib-sys.sh . /octopus-agent/shell/lib/wdd-lib-sys.sh
log "[Octopus Agent Restart !]" log "Octopus Agent Restart !"
FunctionStart FunctionStart

10
source/src/main/java/io/wdd/source/shell/agent-update.sh
View File

@@ -11,13 +11,13 @@ RepoSourcePath=https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/so
CheckAndDownloadLatestVersion CheckAndDownloadLatestVersion
if [[ ! -f /octopus-agent/shell/agent-reboot.sh ]]; then\ if [[ ! -f /octopus-agent/shell/agent-restart.sh ]]; then
warn "agent-bootup.sh not exist! start to download !" warn "agent-bootup.sh not exist! start to download !"
cd /octopus-agent/shell cd /octopus-agent/shell
wget $RepoSourcePath/agent-reboot.sh wget $RepoSourcePath/agent-restart.sh
fi fi
log "start to reboot the octopus agent !" log "start to restart the octopus agent !"
chmod +x /octopus-agent/shell/agent-reboot.sh chmod +x /octopus-agent/shell/agent-restart.sh
/octopus-agent/shell/agent-reboot.sh /octopus-agent/shell/agent-restart.sh

6
source/src/main/java/io/wdd/source/shell/lib/wdd-lib-os.sh
View File

@@ -12,16 +12,14 @@ CheckAndDownloadLatestVersion(){
local latestVersion=$(curl $OctopusAgentUrl | grep -v h1 | grep "a href=" | awk '{print$2}' |cut -d">" -f2 | cut -d"<" -f1) local latestVersion=$(curl $OctopusAgentUrl | grep -v h1 | grep "a href=" | awk '{print$2}' |cut -d">" -f2 | cut -d"<" -f1)
log "octopus agent latest version is => [ $latestVersion ]" log "octopus agent latest version is => [ $latestVersion ]"
echo ""
rm -rf /octopus-agent/*.jar rm -rf /octopus-agent/*.jar
cd /octopus-agent cd /octopus-agent
log "start to download the latest version !" log "start to download the latest version !"
wget "$OctopusAgentUrl$latestVersion" wget "$OctopusAgentUrl$latestVersion"
cp "$latestVersion" agent.jar cp "$latestVersion" agent.jar
echo ""
log ""
echo "" echo ""
log "----------------------------------------------" log "----------------------------------------------"
ls /octopus-agent/ | grep jar ls /octopus-agent/ | grep jar