提交 d8a13ac0 编写于 作者: A Andres Rodriguez

[JENKINS-32190] Make UsageStatistics#isDue check Jenkins init level before generating stats.

上级 9ab3f1d6
...@@ -31,6 +31,7 @@ import hudson.node_monitors.ArchitectureMonitor.DescriptorImpl; ...@@ -31,6 +31,7 @@ import hudson.node_monitors.ArchitectureMonitor.DescriptorImpl;
import hudson.util.IOUtils; import hudson.util.IOUtils;
import hudson.util.Secret; import hudson.util.Secret;
import static hudson.util.TimeUnit2.DAYS; import static hudson.util.TimeUnit2.DAYS;
import static hudson.init.InitMilestone.COMPLETED;
import jenkins.model.Jenkins; import jenkins.model.Jenkins;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
...@@ -95,8 +96,11 @@ public class UsageStatistics extends PageDecorator { ...@@ -95,8 +96,11 @@ public class UsageStatistics extends PageDecorator {
* Returns true if it's time for us to check for new version. * Returns true if it's time for us to check for new version.
*/ */
public boolean isDue() { public boolean isDue() {
// user opted out. no data collection. final Jenkins j = Jenkins.getInstance();
if(!Jenkins.getInstance().isUsageStatisticsCollected() || DISABLED) return false; // user opted out or Jenkins not fully initialized. no data collection.
if (j == null || j.isUsageStatisticsCollected() || DISABLED || COMPLETED.compareTo(j.getInitLevel()) > 0) {
return false;
}
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if(now - lastAttempt > DAY) { if(now - lastAttempt > DAY) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册