Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2908 from jglick/cleanUp
[JENKINS-44589] Adding some missing calls to cleanUp
  • Loading branch information
daniel-beck committed Jun 3, 2017
2 parents 59ae1f6 + 9df863d commit 0ec2508
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
Expand Up @@ -230,6 +230,7 @@ private DefaultLogger createLogger() {
}
});

Jenkins.getInstance().cleanUp();
System.exit(0);
} catch (InterruptedException e) {
e.printStackTrace();
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/jenkins/model/Jenkins.java
Expand Up @@ -945,6 +945,7 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager


if(KILL_AFTER_LOAD)
// TODO cleanUp?
System.exit(0);

setupWizard = new SetupWizard();
Expand Down Expand Up @@ -4262,6 +4263,7 @@ public void doExit( StaplerRequest req, StaplerResponse rsp ) throws IOException
}
}

cleanUp();
System.exit(0);
}

Expand Down

0 comments on commit 0ec2508

Please sign in to comment.