From b8815fc67b241af800a52aa9c206265121ed84a2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 21 Jan 2023 11:13:42 -0500
Subject: [PATCH] Console: Catch graph error in Docker (Gitlab #383)
---
.../java/src/net/i2p/router/web/SummaryRenderer.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
index b26de88978..7e8b1f7a5a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
@@ -349,9 +349,14 @@ class SummaryRenderer {
// NPE here if system is missing fonts - see ticket #915
graph = new RrdGraph(def);
} catch (NullPointerException npe) {
- _log.error("Error rendering", npe);
+ _log.error("Error rendering graph", npe);
StatSummarizer.setDisabled(_context);
- throw new IOException("Error rendering - disabling graph generation. Missing font? See http://trac.i2p2.i2p/ticket/915");
+ throw new IOException("Error rendering - disabling graph generation. Missing font?");
+ } catch (Error e) {
+ // Docker InternalError see Gitlab #383
+ _log.error("Error rendering graph", e);
+ StatSummarizer.setDisabled(_context);
+ throw new IOException("Error rendering - disabling graph generation. Missing font?");
}
int totalWidth = graph.getRrdGraphInfo().getWidth();
int totalHeight = graph.getRrdGraphInfo().getHeight();
--
GitLab