Merge branch 'master' of https://github.com/jenkinsci/workflow-cps-plugin into isComplete

Author: jglick

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -1720,6 +1720,7 @@ public void pause(final boolean v) throws IOException {
                                 LOGGER.log(Level.WARNING, null, t);
                             }
                         });
+                        cpsExec.getOwner().getListener().getLogger().close();
                     }
                 } catch (Exception ex) {
                     LOGGER.log(Level.WARNING, "Error persisting Pipeline execution at shutdown: "+((CpsFlowExecution) execution).owner, ex);

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsGroovyShell.java

@@ -14,6 +14,14 @@
 import java.util.logging.Logger;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.io.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.CompilerConfiguration;
@@ -76,6 +84,46 @@ private static final class CleanGroovyClassLoader extends GroovyClassLoader {
             return new CleanClassCollector(unit, su);
         }
 
+        private static final Pattern JAR_URL = Pattern.compile("jar:(file:/.+[.]jar)!/.+");
+
+        // Avoid expensive and (JDK-6956385) leaky implementations of certain JarURLConnection methods:
+        @Override public URL findResource(String name) {
+            URL url = super.findResource(name);
+            if (url != null && url.getProtocol().equals("jar")) {
+                try {
+                    return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile(), new URLStreamHandler() {
+                        @Override protected URLConnection openConnection(URL url2) throws IOException {
+                            URLConnection delegate = url.openConnection();
+                            return new URLConnection(url2) {
+                                @Override public void connect() throws IOException {
+                                    delegate.connect();
+                                }
+                                @Override public InputStream getInputStream() throws IOException {
+                                    return delegate.getInputStream();
+                                }
+                                @Override public String getHeaderField(String name) {
+                                    return delegate.getHeaderField(name);
+                                }
+                                @Override public long getLastModified() {
+                                    Matcher m = JAR_URL.matcher(url.toString());
+                                    if (m.matches()) {
+                                        return new File(URI.create(m.group(1))).lastModified();
+                                    }
+                                    return delegate.getLastModified();
+                                }
+                                @Override public String getContentEncoding() {
+                                    return null;
+                                }
+                            };
+                        }
+                    });
+                } catch (MalformedURLException x) {
+                    LOGGER.log(Level.WARNING, null, x);
+                }
+            }
+            return url;
+        }
+
         private final class CleanClassCollector extends ClassCollector {
 
             CleanClassCollector(CompilationUnit unit, SourceUnit su) {

plugin/src/test/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinitionRJRTest.java

@@ -1,6 +1,10 @@
 package org.jenkinsci.plugins.workflow.cps;
 
+import hudson.Functions;
+import java.util.logging.Level;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -21,4 +25,28 @@ private static void doesItSmoke(JenkinsRule r) throws Exception {
         p.setDefinition(new CpsFlowDefinition("print Jenkins.get().getRootDir().toString()", false));
         r.assertBuildStatusSuccess(p.scheduleBuild2(0));
     }
+
+    @Test
+    public void flushLogsOnShutdown() throws Throwable {
+        Assume.assumeFalse("RealJenkinsRule does not shut down Jenkins cleanly on Windows, see https://github.com/jenkinsci/jenkins-test-harness/pull/559", Functions.isWindows());
+        rjr.withLogger(CpsFlowExecution.class, Level.FINER);
+        rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPreRestart);
+        rjr.then(CpsFlowDefinitionRJRTest::flushLogsOnShutdownPostRestart);
+    }
+
+    private static void flushLogsOnShutdownPreRestart(JenkinsRule r) throws Exception {
+        WorkflowJob p = r.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition("sleep 10\n", true));
+        WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+        r.waitForMessage("Sleeping for 10 sec", b);
+        r.jenkins.doQuietDown();
+    }
+
+    private static void flushLogsOnShutdownPostRestart(JenkinsRule r) throws Exception {
+        WorkflowJob p = r.jenkins.getItemByFullName("p", WorkflowJob.class);
+        WorkflowRun b = p.getLastBuild();
+        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        r.assertLogContains("Resuming build at ", b);
+        r.assertLogContains("Pausing (Preparing for shutdown)", b);
+    }
 }