Skip to content

Commit 85bf4f8

Browse files
Flanker-MSFTFlanker-MSFT
authored andcommitted
Workaround to swallow exception during DBTools workarounds
1 parent 1169ad1 commit 85bf4f8

File tree

2 files changed

+23
-7
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij

2 files changed

+23
-7
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/dbtools/DbToolsWorkaround.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import com.intellij.openapi.util.JDOMUtil;
1515
import com.intellij.openapi.util.registry.Registry;
1616
import com.microsoft.azure.toolkit.intellij.common.IntelliJAzureIcons;
17+
import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
18+
import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemetry;
1719
import lombok.SneakyThrows;
1820
import org.apache.commons.lang3.StringUtils;
1921
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -22,6 +24,7 @@
2224
import javax.annotation.Nonnull;
2325
import java.lang.reflect.Field;
2426
import java.net.URL;
27+
import java.util.HashMap;
2528
import java.util.List;
2629
import java.util.Objects;
2730
import java.util.Optional;
@@ -38,9 +41,14 @@ public class DbToolsWorkaround extends PreloadingActivity {
3841
@Override
3942
public void preload() {
4043
ApplicationManager.getApplication().executeOnPooledThread(() -> {
41-
DbToolsWorkaround.makeAccountShowAtTop();
42-
loadMongoDriver();
43-
loadCassandraDriver();
44+
try {
45+
DbToolsWorkaround.makeAccountShowAtTop();
46+
loadMongoDriver();
47+
loadCassandraDriver();
48+
} catch (final Throwable t) {
49+
// swallow exception for preloading workarounds
50+
AzureTelemeter.log(AzureTelemetry.Type.ERROR, new HashMap<>(), t);
51+
}
4452
});
4553
}
4654

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-database/src/main/java/com/microsoft/azure/toolkit/intellij/database/dbtools/DatabaseDbToolsWorkaround.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
import com.intellij.database.dataSource.url.template.UrlTemplate;
1111
import com.intellij.openapi.application.ApplicationManager;
1212
import com.intellij.openapi.application.PreloadingActivity;
13+
import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
14+
import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemetry;
1315

16+
import java.util.HashMap;
1417
import java.util.LinkedList;
1518
import java.util.List;
1619
import java.util.Objects;
@@ -19,10 +22,15 @@ public class DatabaseDbToolsWorkaround extends PreloadingActivity {
1922
@Override
2023
public void preload() {
2124
ApplicationManager.getApplication().executeOnPooledThread(() -> {
22-
loadMySqlAzureTemplates();
23-
loadPostgreSqlAzureTemplates();
24-
loadSqlServerAzureTemplates();
25-
loadAzureSqlDatabaseAzureTemplates();
25+
try {
26+
loadMySqlAzureTemplates();
27+
loadPostgreSqlAzureTemplates();
28+
loadSqlServerAzureTemplates();
29+
loadAzureSqlDatabaseAzureTemplates();
30+
} catch (final Throwable t) {
31+
// swallow exception for preloading workarounds
32+
AzureTelemeter.log(AzureTelemetry.Type.ERROR, new HashMap<>(), t);
33+
}
2634
});
2735
}
2836

0 commit comments

Comments
 (0)