Merge pull request #77 from lanwen/JENKINS-30207_fix

[FIXES JENKINS-30207] Don't run cleaner if github plugin not manage hooks
jenkinsci · Aug 30, 2015 · 80c8396 · 80c8396
2 parents 8791c2a + fe0c542
commit 80c8396
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/Cleaner.java b/src/main/java/com/cloudbees/jenkins/Cleaner.java
@@ -55,6 +55,10 @@ public long getRecurrencePeriod() {
      */
     @Override
     protected void doRun() throws Exception {
+        if (!GitHubPlugin.configuration().isManageHooks()) {
+            return;
+        }
+
         URL url = GitHubPlugin.configuration().getHookUrl();
 
         List<AbstractProject> jobs = Jenkins.getInstance().getAllItems(AbstractProject.class);

diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java
@@ -14,6 +14,7 @@
 import org.apache.commons.codec.binary.Base64;
 import org.jenkinsci.main.modules.instance_identity.InstanceIdentity;
 import org.jenkinsci.plugins.github.GitHubPlugin;
+import org.jenkinsci.plugins.github.Messages;
 import org.jenkinsci.plugins.github.internal.GHPluginConfigException;
 import org.jenkinsci.plugins.github.migration.Migrator;
 import org.kohsuke.github.GitHub;
@@ -34,6 +35,7 @@
 
 import static com.google.common.base.Charsets.UTF_8;
 import static java.lang.String.format;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.jenkinsci.plugins.github.config.GitHubServerConfig.allowedToManageHooks;
 import static org.jenkinsci.plugins.github.config.GitHubServerConfig.loginToGithub;
 import static org.jenkinsci.plugins.github.util.FluentIterableWrapper.from;
@@ -103,13 +105,17 @@ public void setOverrideHookUrl(boolean overrideHookUrl) {
 
     public URL getHookUrl() throws GHPluginConfigException {
         try {
+            String jenkinsUrl = Jenkins.getInstance().getRootUrl();
+
+            if (isEmpty(jenkinsUrl)) {
+                throw new GHPluginConfigException(Messages.global_config_url_is_empty());
+            }
+
             return hookUrl != null
                     ? hookUrl
-                    : new URL(Jenkins.getInstance().getRootUrl() + GitHubWebHook.get().getUrlName() + '/');
+                    : new URL(jenkinsUrl + GitHubWebHook.get().getUrlName() + '/');
         } catch (MalformedURLException e) {
-            throw new GHPluginConfigException(
-                    "Mailformed GH hook url in global configuration (%s)", e.getMessage()
-            );
+            throw new GHPluginConfigException(Messages.global_config_hook_url_is_mailformed(e.getMessage()));
         }
     }
 

diff --git a/src/main/resources/org/jenkinsci/plugins/github/Messages.properties b/src/main/resources/org/jenkinsci/plugins/github/Messages.properties
@@ -0,0 +1,2 @@
+global.config.url.is.empty=Jenkins URL is empty. Set explicitly Jenkins URL in global configuration or in GitHub plugin configuration to manage hooks.
+global.config.hook.url.is.mailformed=Mailformed GH hook url in global configuration ({0})