Remove checkstyle exit behavior due to hang.

cs125-illinois · Oct 18, 2021 · 7ec3433 · 7ec3433
1 parent 1bc452f
commit 7ec3433
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.cs125-illinois"
-version = "2021.10.6"
+version = "2021.10.8"
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.31")

diff --git a/plugin/src/main/java/edu/illinois/cs/cs125/gradlegrader/plugin/GradeTask.kt b/plugin/src/main/java/edu/illinois/cs/cs125/gradlegrader/plugin/GradeTask.kt
@@ -120,7 +120,7 @@ open class GradeTask : DefaultTask() {
     @Suppress("unused")
     fun run() {
         val config = project.extensions.getByType(GradePolicyExtension::class.java)
-        val exitManager = ExitManager(config)
+        // val exitManager = ExitManager(config)
         val documentBuilder = DocumentBuilderFactory.newInstance().apply {
             isValidating = false
             isNamespaceAware = false
@@ -129,7 +129,6 @@ open class GradeTask : DefaultTask() {
         val scoringResults = JsonArray()
         var pointsPossible = 0
         var pointsEarned = 0
-        var exitProcessWhenDone = false
 
         // Add custom tags
         config.reporting.tags.forEach {
@@ -246,7 +245,7 @@ open class GradeTask : DefaultTask() {
                 checkstyleResults.addProperty("explanation", "checkstyle crashed")
                 // If checkstyle crashed, it leaked the file handle
                 // Future cleans will crash and fail the build unless we bring down this process
-                exitProcessWhenDone = true
+                // exitProcessWhenDone = true
             }
             checkstyleResults.addProperty("description", "checkstyle")
             checkstyleResults.addProperty("pointsEarned", checkstylePoints)
@@ -330,12 +329,16 @@ open class GradeTask : DefaultTask() {
             contributors!!.forEach { contribArray.add(it) }
             results.add("contributors", contribArray)
         }
-        if (config.captureOutput) results.addProperty("output", taskOutput)
+        if (config.captureOutput) {
+            results.addProperty("output", taskOutput)
+        }
 
         // Make the JSON report(s)
         val resultJson = results.toString()
         config.reporting.jsonFile?.writeText(resultJson)
-        if (config.reporting.printJson) println(resultJson)
+        if (config.reporting.printJson) {
+            println(resultJson)
+        }
 
         // Make the pretty report
         if (config.reporting.printPretty.enabled) {
@@ -399,6 +402,6 @@ open class GradeTask : DefaultTask() {
         }
 
         // Exit as desired
-        exitManager.finished(exitProcessWhenDone)
+        // exitManager.finished(exitProcessWhenDone)
     }
 }