ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: improved Maven timeout policy (issue #449)

Browse Source 
* only timeout if Maven did not generate output during the last 60 seconds
This commit is contained in:
mlangkabel
2017-08-29 14:15:11 +02:00
parent d8413b1cb4
commit 64efa00054
4 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/project/SourceGroupJava.cpp
+9 -6
View File
@@ -162,16 +162,19 @@ bool SourceGroupJava::prepareMavenData()
"Please make sure to provide the correct Maven Path in the preferences.";
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
return false;
}
dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nExporting Dependencies");
if (success)
{
dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nExporting Dependencies");
utility::mavenCopyDependencies(
mavenPath, projectRootPath, m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute()
);
success = utility::mavenCopyDependencies(
mavenPath, projectRootPath, m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute()
);
}
return success;
}
return true;
src/lib_java/utility/utilityMaven.cpp
+24 -6
View File
@@ -66,9 +66,10 @@ namespace utility
{
setJavaHomeVariableIfNotExists();
const std::string output = utility::executeProcess(
const std::string output = utility::executeProcessUntilNoOutput(
"\"" + mavenPath.str() + "\" generate-sources",
projectDirectoryPath.str()
projectDirectoryPath.str(),
60000
);
return !output.empty();
}
@@ -77,10 +78,26 @@ namespace utility
{
setJavaHomeVariableIfNotExists();
const std::string output = utility::executeProcess(
const std::string output = utility::executeProcessUntilNoOutput(
"\"" + mavenPath.str() + "\" dependency:copy-dependencies -DoutputDirectory=" + outputDirectoryPath.str(),
projectDirectoryPath.str()
projectDirectoryPath.str(),
60000
);
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(output);
for (const std::string& line: outputAccess->getAllLines())
{
if (utility::isPrefix("[ERROR]", utility::trim(line)))
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Maven command:\n\n" + utility::replace(line, "\r\n", "\n");
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
return false;
}
}
return !output.empty();
}
@@ -88,9 +105,10 @@ namespace utility
{
setJavaHomeVariableIfNotExists();
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(utility::executeProcess(
std::shared_ptr<TextAccess> outputAccess = TextAccess::createFromString(utility::executeProcessUntilNoOutput(
"\"" + mavenPath.str() + "\" help:effective-pom",
projectDirectoryPath.str()
projectDirectoryPath.str(),
60000
));
if (outputAccess->getLineCount() > 0 && utility::isPrefix("Error", utility::trim(outputAccess->getLine(1))))