Skip to content

Commit 8a4c0f2

Browse files
Jay.H.ZouJay.H.Zou
authored andcommitted
installation log and websocket
1 parent 00011d8 commit 8a4c0f2

File tree

13 files changed

+21
-11
lines changed

13 files changed

+21
-11
lines changed

redis-manager-dashboard/src/main/java/com/newegg/ec/redis/plugin/install/InstallationTemplate.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,36 @@ public boolean installFlow(AbstractNodeOperation installationOperation, Installa
8181
}
8282
// 数据准备
8383
InstallationWebSocketHandler.appendLog(clusterName, "Start preparing installation...");
84+
logger.info(clusterName + " start preparing installation...");
8485
boolean prepareSuccess = prepareForInstallation(installationOperation, installationParam);
8586
if (!prepareSuccess) {
8687
return false;
8788
}
88-
8989
InstallationWebSocketHandler.appendLog(clusterName, "Start pulling redis.conf...");
90+
logger.info(clusterName + " start pulling redis.conf...");
9091
// 分发配置文件
9192
boolean pullConfigSuccess = pullConfig(installationOperation, installationParam);
9293
if (!pullConfigSuccess) {
9394
return false;
9495
}
9596

9697
InstallationWebSocketHandler.appendLog(clusterName, "Start pulling image...");
98+
logger.info(clusterName + " start pulling image...");
9799
boolean pullImageSuccess = pullImage(installationOperation, installationParam);
98100
// 拉取安装包
99101
if (!pullImageSuccess) {
100102
return false;
101103
}
102104

103105
InstallationWebSocketHandler.appendLog(clusterName, "Start installing redis node...");
106+
logger.info(clusterName + " start installing redis node...");
104107
// 节点安装
105108
boolean installSuccess = install(installationOperation, installationParam);
106109
if (!installSuccess) {
107110
return false;
108111
}
109112
InstallationWebSocketHandler.appendLog(clusterName, "Start initializing...");
113+
logger.info(clusterName + " start initializing...");
110114
boolean initSuccess;
111115
if (Objects.equals(redisMode, CLUSTER)) {
112116
initSuccess = initCluster(installationParam);
@@ -117,6 +121,7 @@ public boolean installFlow(AbstractNodeOperation installationOperation, Installa
117121
InstallationWebSocketHandler.appendLog(clusterName, "Initialized error.");
118122
}
119123
InstallationWebSocketHandler.appendLog(clusterName, "Start saving to database...");
124+
logger.info(clusterName + " start saving to database...");
120125
return saveToDB(installationParam);
121126
}
122127

@@ -207,6 +212,7 @@ private boolean checkMachineList(InstallationParam installationParam) {
207212
SSH2Util.getConnection(machine);
208213
} catch (Exception e) {
209214
InstallationWebSocketHandler.appendLog(clusterName, machine.getHost() + " connection refused");
215+
logger.info(clusterName + " " + machine.getHost() + " connection refused");
210216
result = false;
211217
}
212218
}

redis-manager-dashboard/src/main/resources/static/css/app.768aa179ffac6000d4329e1195684e81.css renamed to redis-manager-dashboard/src/main/resources/static/css/app.3a68b0a6aaff9e34729e841092f8852d.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

redis-manager-dashboard/src/main/resources/static/css/app.768aa179ffac6000d4329e1195684e81.css.map renamed to redis-manager-dashboard/src/main/resources/static/css/app.3a68b0a6aaff9e34729e841092f8852d.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

redis-manager-dashboard/src/main/resources/static/js/app.deec4299757feb7ddc91.js renamed to redis-manager-dashboard/src/main/resources/static/js/app.581094191e8806c0549d.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

redis-manager-dashboard/src/main/resources/static/js/app.581094191e8806c0549d.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

redis-manager-dashboard/src/main/resources/static/js/app.deec4299757feb7ddc91.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)