MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix retry of remote skeleton generation after vagrant start (PY-13174).

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-06-25 09:26:23 +02:00
parent 45b6893c1d
commit 35357d307a
1 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
+47 -42
View File
@@ -15,6 +15,7 @@
*/
package com.jetbrains.python.sdk;
import com.google.common.collect.Sets;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -91,51 +92,55 @@ public class PythonSdkUpdater implements StartupActivity {
// NOTE: everything is run later on the AWT thread
if (!sdksToUpdate.isEmpty()) {
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
public void run() {
if (delay > 0) {
try {
Thread.sleep(delay); // wait until all short-term disk-hitting activity ceases
}
catch (InterruptedException ignore) {
}
}
// update skeletons
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
ProgressManager.getInstance().run(new Task.Backgroundable(project, PyBundle.message("sdk.gen.updating.skels"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
for (final Sdk sdk : sdksToUpdate) {
try {
LOG.info("Performing background update of skeletons for SDK " + sdk.getHomePath());
updateSdk(project, sdk);
}
catch (InvalidSdkException e) {
if (PythonSdkType.isRemote(sdk)) {
PythonSdkType.notifyRemoteSdkSkeletonsFail(e, new Runnable() {
@Override
public void run() {
updateActiveSdks(project, delay);
}
});
}
else if (!PythonSdkType.isInvalid(sdk)) {
LOG.error(e);
}
}
myAlreadyUpdated.add(sdk.getHomePath());
}
}
});
}
});
}
});
updateSdks(project, delay, sdksToUpdate);
}
}
private void updateSdks(final Project project, final int delay, final Set<Sdk> sdksToUpdate) {
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
public void run() {
if (delay > 0) {
try {
Thread.sleep(delay); // wait until all short-term disk-hitting activity ceases
}
catch (InterruptedException ignore) {
}
}
// update skeletons
ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
ProgressManager.getInstance().run(new Task.Backgroundable(project, PyBundle.message("sdk.gen.updating.skels"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
for (final Sdk sdk : sdksToUpdate) {
try {
LOG.info("Performing background update of skeletons for SDK " + sdk.getHomePath());
updateSdk(project, sdk);
}
catch (InvalidSdkException e) {
if (PythonSdkType.isRemote(sdk)) {
PythonSdkType.notifyRemoteSdkSkeletonsFail(e, new Runnable() {
@Override
public void run() {
updateSdks(project, delay, Sets.newHashSet(sdk));
}
});
}
else if (!PythonSdkType.isInvalid(sdk)) {
LOG.error(e);
}
}
myAlreadyUpdated.add(sdk.getHomePath());
}
}
});
}
});
}
});
}
private static void updateSdk(@NotNull Project project, @NotNull final Sdk sdk) throws InvalidSdkException {
PySkeletonRefresher.refreshSkeletonsOfSdk(project, sdk); // NOTE: whole thing would need a rename
if (!PySdkUtil.isRemote(sdk)) {