From 4d0a5e8846bdcc95e35ebdf5ad7223130223132e Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 10:54:12 +0000
Subject: [PATCH] Display borg response on errors.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index 734c97a..1d48603 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -22,6 +22,9 @@
public static RepoInfo info(BorgRepoConfig repoConfig) {
String json = execute(repoConfig, "info", "--json");
+ if (json == null) {
+ return null;
+ }
RepoInfo repoInfo = JsonUtils.fromJson(RepoInfo.class, json);
repoInfo.setOriginalJson(json);
return repoInfo;
@@ -29,6 +32,9 @@
public static RepoList list(BorgRepoConfig repoConfig) {
String json = execute(repoConfig, "list", "--json");
+ if (json == null) {
+ return null;
+ }
RepoList repoList = JsonUtils.fromJson(RepoList.class, json);
repoList.setOriginalJson(json);
return repoList;
@@ -53,8 +59,11 @@
log.info("Executing '" + borgCall + "'...");
try {
executor.execute(cmdLine, getEnvironment(repoConfig));
- } catch (IOException ex) {
+ } catch (Exception ex) {
log.error("Error while creating environment for borg call '" + borgCall + "': " + ex.getMessage(), ex);
+ String response = outputStream.toString(Charset.forName("UTF-8"));
+ log.error("Response: " + response);
+ return null;
}
String json = outputStream.toString(Charset.forName("UTF-8"));
return json;
--
Gitblit v1.10.0