osx: Fix for JENKINS-12622 - opening browser too early

jenkinsci · Feb 2, 2012 · eae3e3d · eae3e3d
1 parent b816be6
commit eae3e3d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -61,6 +61,10 @@
   <li class=bug>
     Broken links to test results with '#' or '?' in the name
     (a href="https://issues.jenkins-ci.org/browse/JENKINS-10458">issue 10458</a>)
+  <li class="bug">
+    Fix launching browser too early to http://localhost:8080 in OS X
+    installer.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-12622">issue 12622</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/osx/scripts/postinstall-launchd b/osx/scripts/postinstall-launchd
@@ -10,3 +10,15 @@ find /Users/Shared/Jenkins \( -not -user daemon -or -not -group daemon \) -print
 
 # Load and start the launch daemon
 /bin/launchctl load -w ${JENKINS_PLIST}
+
+# Wait for port 8080 to start accepting connections.
+# But don't wait forever.
+timeout=$(($(date +%s) + 60))
+while [ $(date +%s) -lt $timeout ] && ! curl -s http://localhost:8080 >/dev/null; do
+    sleep 1
+done
+
+if [ $(date +%s) -ge $timeout ]; then
+    echo "Timed out waiting for Jenkins port 8080 to start listening!"
+    echo "Either Jenkins did not load or this system is very slow."
+fi
diff --git a/osx/scripts/postinstall-launchd-jenkins b/osx/scripts/postinstall-launchd-jenkins
@@ -42,3 +42,15 @@ find "$JENKINS_HOMEDIR" \( -not -user jenkins -or -not -group jenkins \) -print0
 
 # Load and start the launch daemon
 /bin/launchctl load -w ${JENKINS_PLIST}
+
+# Wait for port 8080 to start accepting connections.
+# But don't wait forever.
+timeout=$(($(date +%s) + 60))
+while [ $(date +%s) -lt $timeout ] && ! curl -s http://localhost:8080 >/dev/null; do
+    sleep 1
+done
+
+if [ $(date +%s) -ge $timeout ]; then
+    echo "Timed out waiting for Jenkins port 8080 to start listening!"
+    echo "Either Jenkins did not load or this system is very slow."
+fi