iSharkFly-Open
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc 

Bug fix: gRPC check throws errors when response data size > 50 chars
This commit is contained in:
Louis Lam 2023-01-01 13:57:10 +08:00 committed by GitHub
parent cd7a6e4019 d111db0321
commit 41a9f2ff8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/model/monitor.js
View File

@ -548,7 +548,7 @@ class Monitor extends BeanModel {
log.debug("monitor:", `gRPC response: ${JSON.stringify(response)}`); log.debug("monitor:", `gRPC response: ${JSON.stringify(response)}`);
let responseData = response.data; let responseData = response.data;
if (responseData.length > 50) { if (responseData.length > 50) {
responseData = response.substring(0, 47) + "..."; responseData = responseData.toString().substring(0, 47) + "...";
} }
if (response.code !== 1) { if (response.code !== 1) {
bean.status = DOWN; bean.status = DOWN;

1
server/server.js
View File

@ -714,6 +714,7 @@ let needSetup = false;
bean.authDomain = monitor.authDomain; bean.authDomain = monitor.authDomain;
bean.grpcUrl = monitor.grpcUrl; bean.grpcUrl = monitor.grpcUrl;
bean.grpcProtobuf = monitor.grpcProtobuf; bean.grpcProtobuf = monitor.grpcProtobuf;
bean.grpcServiceName = monitor.grpcServiceName;
bean.grpcMethod = monitor.grpcMethod; bean.grpcMethod = monitor.grpcMethod;
bean.grpcBody = monitor.grpcBody; bean.grpcBody = monitor.grpcBody;
bean.grpcMetadata = monitor.grpcMetadata; bean.grpcMetadata = monitor.grpcMetadata;

43
server/util-server.js
View File

@ -778,22 +778,31 @@ module.exports.grpcQuery = async (options) => {
cb); cb);
}, false, false); }, false, false);
return new Promise((resolve, _) => { return new Promise((resolve, _) => {
return grpcService[`${grpcMethod}`](JSON.parse(grpcBody), function (err, response) { try {
const responseData = JSON.stringify(response); return grpcService[`${grpcMethod}`](JSON.parse(grpcBody), function (err, response) {
if (err) { const responseData = JSON.stringify(response);
return resolve({ if (err) {
code: err.code, return resolve({
errorMessage: err.details, code: err.code,
data: "" errorMessage: err.details,
}); data: ""
} else { });
log.debug("monitor:", `gRPC response: ${response}`); } else {
return resolve({ log.debug("monitor:", `gRPC response: ${JSON.stringify(response)}`);
code: 1, return resolve({
errorMessage: "", code: 1,
data: responseData errorMessage: "",
}); data: responseData
} });
}); }
});
} catch (err) {
return resolve({
code: -1,
errorMessage: `Error ${err}. Please review your gRPC configuration option. The service name must not include package name value, and the method name must follow camelCase format`,
data: ""
});
}
}); });
}; };