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

Allow to interrupt gradle wrapper command.

Browse Source 
and report exceptions accordingly. IDEA-192927
This commit is contained in:
Nikita Skvortsov
2018-05-30 14:56:04 +03:00
parent cab15a4d16
commit 9b84e36c79
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
+5 -1
View File
@@ -233,7 +233,8 @@ public class GradleExecutionHelper {
public void ensureInstalledWrapper(@NotNull ExternalSystemTaskId id,
@NotNull String projectPath,
@NotNull GradleExecutionSettings settings,
@NotNull ExternalSystemTaskNotificationListener listener) {
@NotNull ExternalSystemTaskNotificationListener listener,
@NotNull CancellationTokenSource cancellationTokenSource) {
if (!settings.getDistributionType().isWrapped()) return;
@@ -263,6 +264,7 @@ public class GradleExecutionHelper {
final File tempFile = writeToFileGradleInitScript(StringUtil.join(lines, SystemProperties.getLineSeparator()));
settings.withArguments(GradleConstants.INIT_SCRIPT_CMD_OPTION, tempFile.getAbsolutePath());
BuildLauncher launcher = getBuildLauncher(id, connection, settings, listener);
launcher.withCancellationToken(cancellationTokenSource.token());
launcher.forTasks("wrapper");
launcher.run();
String wrapperPropertyFile = FileUtil.loadFile(wrapperPropertyFileLocation);
@@ -274,6 +276,8 @@ public class GradleExecutionHelper {
}
catch (Throwable e) {
LOG.warn("Can't update wrapper", e);
Throwable rootCause = ExceptionUtil.getRootCause(e);
throw new ExternalSystemException(ExceptionUtil.getMessage(rootCause));
}
finally {
settings.setRemoteProcessIdleTtlInMs(ttlInMs);
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+26 -25
View File
@@ -56,7 +56,6 @@ import org.jetbrains.plugins.gradle.model.data.CompositeBuildData;
import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData;
import org.jetbrains.plugins.gradle.remote.impl.GradleLibraryNamesMixer;
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper;
import org.jetbrains.plugins.gradle.service.execution.UnsupportedCancellationToken;
import org.jetbrains.plugins.gradle.settings.ClassHolder;
import org.jetbrains.plugins.gradle.settings.DistributionType;
import org.jetbrains.plugins.gradle.settings.GradleBuildParticipant;
@@ -129,20 +128,33 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
return projectDataNode;
}
if (settings != null) {
myHelper.ensureInstalledWrapper(syncTaskId, projectPath, settings, listener);
DefaultProjectResolverContext resolverContext = new DefaultProjectResolverContext(syncTaskId, projectPath, settings, listener, false);
final CancellationTokenSource cancellationTokenSource = GradleConnector.newCancellationTokenSource();
resolverContext.setCancellationTokenSource(cancellationTokenSource);
synchronized (myCancellationMap) {
myCancellationMap.putValue(resolverContext.getExternalSystemTaskId(), cancellationTokenSource);
}
final GradleProjectResolverExtension projectResolverChain = createProjectResolverChain(settings);
DefaultProjectResolverContext resolverContext = new DefaultProjectResolverContext(syncTaskId, projectPath, settings, listener, false);
final DataNode<ProjectData> projectDataNode = myHelper.execute(
projectPath, settings, getProjectDataFunction(resolverContext, projectResolverChain, false));
try {
if (settings != null) {
myHelper.ensureInstalledWrapper(syncTaskId, projectPath, settings, listener, cancellationTokenSource);
}
// auto-discover buildSrc projects of the main and included builds
File gradleUserHome = resolverContext.getUserData(GRADLE_HOME_DIR);
new GradleBuildSrcProjectsResolver(this, resolverContext, gradleUserHome, settings, listener, syncTaskId, projectResolverChain)
.discoverAndAppendTo(projectDataNode);
return projectDataNode;
final GradleProjectResolverExtension projectResolverChain = createProjectResolverChain(settings);
final DataNode<ProjectData> projectDataNode = myHelper.execute(
projectPath, settings, getProjectDataFunction(resolverContext, projectResolverChain, false));
// auto-discover buildSrc projects of the main and included builds
File gradleUserHome = resolverContext.getUserData(GRADLE_HOME_DIR);
new GradleBuildSrcProjectsResolver(this, resolverContext, gradleUserHome, settings, listener, syncTaskId, projectResolverChain)
.discoverAndAppendTo(projectDataNode);
return projectDataNode;
} finally {
synchronized (myCancellationMap) {
myCancellationMap.remove(resolverContext.getExternalSystemTaskId(), cancellationTokenSource);
}
}
}
@NotNull
@@ -258,19 +270,11 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
GradleExecutionHelper.prepare(buildActionExecutor, resolverCtx.getExternalSystemTaskId(),
executionSettings, resolverCtx.getListener(), resolverCtx.getConnection());
resolverCtx.checkCancelled();
ProjectImportAction.AllModels allModels;
final CancellationTokenSource cancellationTokenSource = GradleConnector.newCancellationTokenSource();
final long startTime = System.currentTimeMillis();
try {
resolverCtx.setCancellationTokenSource(cancellationTokenSource);
buildActionExecutor.withCancellationToken(cancellationTokenSource.token());
synchronized (myCancellationMap) {
myCancellationMap.putValue(resolverCtx.getExternalSystemTaskId(), cancellationTokenSource);
if (gradleVersion != null && gradleVersion.compareTo(GradleVersion.version("2.1")) < 0) {
myCancellationMap.putValue(resolverCtx.getExternalSystemTaskId(), new UnsupportedCancellationToken());
}
}
buildActionExecutor.withCancellationToken(resolverCtx.getCancellationTokenSource().token());
allModels = buildActionExecutor.run();
if (allModels == null) {
throw new IllegalStateException("Unable to get project model for the project: " + resolverCtx.getProjectPath());
@@ -296,9 +300,6 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
}
finally {
final long timeInMs = (System.currentTimeMillis() - startTime);
synchronized (myCancellationMap) {
myCancellationMap.remove(resolverCtx.getExternalSystemTaskId(), cancellationTokenSource);
}
performanceTrace.logPerformance("Gradle data obtained", timeInMs);
LOG.debug(String.format("Gradle data obtained in %d ms", timeInMs));
}