- improve classpath resolution and error reporting

jalgoarena · Aug 3, 2018 · 9e33cfc · 9e33cfc
1 parent 34d9745
commit 9e33cfc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/kotlin/com/jalgoarena/compile/InMemoryJavaCompiler.kt b/src/main/kotlin/com/jalgoarena/compile/InMemoryJavaCompiler.kt
@@ -72,8 +72,6 @@ open class InMemoryJavaCompiler : JvmCompiler {
         val classpath = mutableListOf<String>()
 
         addToClassPath(classpath, "build/classes/kotlin/main")
-        // local/ for nomad alloc
-        addToClassPath(classpath, "local/build/classes/kotlin/main")
 
         val result = classpath.joinToString(File.pathSeparator)
         logger.info("Classpath: $result")
@@ -82,11 +80,13 @@ open class InMemoryJavaCompiler : JvmCompiler {
 
     private fun addToClassPath(classpath: MutableList<String>, path: String) {
         val dockerPath = "/app/$path"
+        val nomadPath = "local/$path"
 
         when {
             File(path).exists() -> classpath.add(File(path).absolutePath)
             File(dockerPath).exists() -> classpath.add(File(dockerPath).absolutePath)
-            else -> logger.error("Could not find $path nor $dockerPath!!")
+            File(nomadPath).exists() -> classpath.add(File(nomadPath).absolutePath)
+            else -> logger.warn("[err] Could not find any of paths: [$path, $dockerPath, $nomadPath]")
         }
     }