bump deps, prevent circular JSON in some logging scenarios, ensure rsync in images

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen
2022-03-23 09:00:34 -06:00
parent 30fe46ee34
commit 810025150c
6 changed files with 72 additions and 64 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
const { sleep } = require("../../../utils/general");
const { sleep, stringify } = require("../../../utils/general");
const { Zetabyte } = require("../../../utils/zfs");
// used for in-memory cache of the version info
@@ -279,7 +279,7 @@ class Api {
// likely bad creds/url
throw new GrpcError(
grpc.status.UNKNOWN,
`FreeNAS error getting system version info: ${JSON.stringify({
`FreeNAS error getting system version info: ${stringify({
errors: versionErrors,
responses: versionResponses,
})}`
+2 -2
View File
@@ -4,7 +4,7 @@ const { GrpcError, grpc } = require("../../utils/grpc");
const SshClient = require("../../utils/ssh").SshClient;
const HttpClient = require("./http").Client;
const { Zetabyte, ZfsSshProcessManager } = require("../../utils/zfs");
const sleep = require("../../utils/general").sleep;
const { sleep, stringify } = require("../../utils/general");
const Handlebars = require("handlebars");
@@ -2109,7 +2109,7 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver {
// likely bad creds/url
throw new GrpcError(
grpc.status.UNKNOWN,
`FreeNAS error getting system version info: ${JSON.stringify({
`FreeNAS error getting system version info: ${stringify({
errors: versionErrors,
responses: versionResponses,
})}`