Nicer error pages

jenkinsci · Aug 28, 2023 · 0fc7b35 · 0fc7b35
1 parent 97c46e1
commit 0fc7b35
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/.run/start jenkins.run.xml b/.run/start jenkins.run.xml
@@ -43,6 +43,16 @@
         </MavenRunnerParameters>
       </option>
     </MavenSettings>
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2" />
   </configuration>
 </component>
diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java b/plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java
@@ -169,7 +169,18 @@ public void doReload(StaplerRequest request, StaplerResponse response) throws Ex
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
             return;
         }
-        configure();
+
+        try {
+            configure();
+        } catch (ConfiguratorException e) {
+            LOGGER.log(Level.SEVERE, "Failed to reload configuration", e);
+            request.setAttribute("error", e.getMessage());
+            if (e.getCause() != null) {
+                request.setAttribute("cause", e.getCause().getMessage());
+            }
+            request.getView(this, "error.jelly").forward(request, response);
+            return;
+        }
         response.sendRedirect("");
     }
 

diff --git a/plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/error.jelly b/plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/error.jelly
@@ -0,0 +1,13 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
+  <l:layout type="one-column" title="${%Error loading configuration}">
+    <l:main-panel>
+     <l:app-bar title="${%Error loading configuration}" />
+
+      <p>${error}</p>
+      <j:if test="${cause != null}">
+        <p>${cause}</p>
+      </j:if>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>