Merge branch '2.3' into 2.4

2020-05-11 08:42:02 +03:00
parent deae315dce 73eba01ce9
commit 4cc5fa115a
5 changed files with 59 additions and 15 deletions
--- a/maxctrl/lib/common.js
+++ b/maxctrl/lib/common.js
@ -361,7 +361,12 @@ module.exports = function() {
        args.auth = {user: argv.u, pass: argv.p}
        args.json = true
        args.timeout = this.argv.timeout
-        setTlsCerts(args)
+
+        try {
+            setTlsCerts(args)
+        } catch (err) {
+            return error('Failed to set TLS certificates: ' + JSON.stringify(err, null, 4))
+        }

        return request(args)
            .then(function(res) {