Merge pull request #98 from mesosphere/webUI-integration

Adding WebUI field to Framework Info
jenkinsci · Apr 21, 2015 · ee26f67 · ee26f67
2 parents aa6d7e6 + 797675d
commit ee26f67
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/mesos/JenkinsScheduler.java b/src/main/java/org/jenkinsci/plugins/mesos/JenkinsScheduler.java
@@ -104,12 +104,15 @@ public synchronized void init() {
       @Override
       public void run() {
         String targetUser = mesosCloud.getSlavesUser();
+        String webUrl = Jenkins.getInstance().getRootUrl();
+        if (webUrl == null) webUrl = System.getenv("JENKINS_URL");
         // Have Mesos fill in the current user.
         FrameworkInfo framework = FrameworkInfo.newBuilder()
           .setUser(targetUser == null ? "" : targetUser)
           .setName(mesosCloud.getFrameworkName())
           .setPrincipal(mesosCloud.getPrincipal())
           .setCheckpoint(mesosCloud.isCheckpoint())
+          .setWebuiUrl(webUrl != null ? webUrl :  "")
           .build();
 
         LOGGER.info("Initializing the Mesos driver with options"