diff --git a/platform/platform-impl/src/com/intellij/idea/ApplicationLoader.kt b/platform/platform-impl/src/com/intellij/idea/ApplicationLoader.kt index 395f777c62c6..71dd5b6f1afd 100644 --- a/platform/platform-impl/src/com/intellij/idea/ApplicationLoader.kt +++ b/platform/platform-impl/src/com/intellij/idea/ApplicationLoader.kt @@ -26,6 +26,7 @@ import com.intellij.openapi.components.service import com.intellij.openapi.components.serviceAsync import com.intellij.openapi.components.stateStore import com.intellij.openapi.diagnostic.Logger +import com.intellij.openapi.diagnostic.debug import com.intellij.openapi.diagnostic.getOrLogException import com.intellij.openapi.editor.colors.EditorColorsManager import com.intellij.openapi.extensions.ExtensionPointName @@ -467,9 +468,7 @@ private suspend fun executePreloadActivity(activity: PreloadingActivity, descrip try { activity.execute() - if (isDebugEnabled) { - LOG.debug("${activity.javaClass.name} finished") - } + LOG.debug { "${activity.javaClass.name} finished" } } catch (e: CancellationException) { throw e diff --git a/plugins/stats-collector/src/com/intellij/stats/completion/sender/SenderPreloadingActivity.kt b/plugins/stats-collector/src/com/intellij/stats/completion/sender/SenderPreloadingActivity.kt index 718d05dc3aff..6eb066ff1ce1 100644 --- a/plugins/stats-collector/src/com/intellij/stats/completion/sender/SenderPreloadingActivity.kt +++ b/plugins/stats-collector/src/com/intellij/stats/completion/sender/SenderPreloadingActivity.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.stats.completion.sender import com.intellij.internal.statistic.utils.StatisticsUploadAssistant @@ -21,19 +21,17 @@ internal fun isCompletionLogsSendAllowed(): Boolean { return ApplicationManager.getApplication().isEAP && java.lang.Boolean.parseBoolean(System.getProperty("completion.stats.send.logs", "true")) } -private val LOG = logger() - @Service private class StatsCollectorPluginDisposable : Disposable { override fun dispose() { } } -internal class SenderPreloadingActivity : PreloadingActivity() { +private class SenderPreloadingActivity : PreloadingActivity() { private val alarm = Alarm(Alarm.ThreadToUse.POOLED_THREAD, service()) private val sendInterval = 5 * Time.MINUTE - override fun preload() { + override suspend fun execute() { val app = ApplicationManager.getApplication() if (app.isUnitTestMode || app.isHeadlessEnvironment) { return @@ -50,7 +48,7 @@ internal class SenderPreloadingActivity : PreloadingActivity() { } try { - WebServiceStatusManager.getAllStatuses().forEachLoggingErrors(LOG) { status -> + WebServiceStatusManager.getAllStatuses().forEachLoggingErrors(logger()) { status -> status.update() if (status.isServerOk()) { service().sendStatsData(status.dataServerUrl())