[FIXED JENKINS-17933] Catch errors in init.groovy.

jenkinsci · May 13, 2013 · 6884201 · 6884201
1 parent e1473e2
commit 6884201
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 4 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,7 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class=bug>
+    Errors in <code>init.groovy</code> halted startup; changed to just log a warning.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17933">issue 17933</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/init/impl/GroovyInitScript.java b/core/src/main/java/hudson/init/impl/GroovyInitScript.java
@@ -31,12 +31,12 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.logging.Logger;
 
 import jenkins.model.Jenkins;
 import static hudson.init.InitMilestone.JOB_LOADED;
 import hudson.init.Initializer;
+import java.util.logging.Level;
 
 /**
  * Run the initialization script, if it exists.
@@ -78,9 +78,13 @@ private static void execute(File initScript) throws IOException {
         execute(new GroovyCodeSource(initScript));
     }
 
-    private static void execute(GroovyCodeSource initScript) throws IOException {
+    private static void execute(GroovyCodeSource initScript) {
         GroovyShell shell = new GroovyShell(Jenkins.getInstance().getPluginManager().uberClassLoader);
-        shell.evaluate(initScript);
+        try {
+            shell.evaluate(initScript);
+        } catch (RuntimeException x) {
+            LOGGER.log(Level.WARNING, "Failed to run script " + initScript.getName(), x);
+        }
     }
 
     private static final Logger LOGGER = Logger.getLogger(GroovyInitScript.class.getName());

diff --git a/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java b/test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java
@@ -0,0 +1,47 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2013 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.init.impl;
+
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.LocalData;
+
+public class GroovyInitScriptTest {
+
+    @Rule public JenkinsRule j = new JenkinsRule();
+
+    @Bug(17933)
+    @LocalData
+    @Test public void errorsHandled() throws Exception {
+        assertEquals("true", System.getProperty("started"));
+        /* XXX Jenkins.logRecords empty during a test, and adding a handler to root logger in JenkinsRule.before() does not work:
+        assertTrue(log, log.contains("Nonexistent"));
+        */
+    }
+
+}
diff --git a/test/src/test/resources/hudson/init/impl/GroovyInitScriptTest/errorsHandled.zip b/test/src/test/resources/hudson/init/impl/GroovyInitScriptTest/errorsHandled.zip