Set hydra.log location, Fix #30

triplequote · Nov 13, 2017 · c3e42af · c3e42af
1 parent 9080b71
commit c3e42af
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettings.scala
@@ -28,6 +28,8 @@ class HydraCompilerSettings(project: Project) extends PersistentStateComponent[H
 
   var hydraStorePath: String = getDefaultHydraStorePath
 
+  var hydraLogLocation: String = Paths.get(getDefaultHydraStorePath, "hydra.log").toString
+
   var sourcePartitioner: String = Auto.value
 
   override def getState: HydraCompilerSettingsState = {

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettingsManager.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/compiler/HydraCompilerSettingsManager.scala
@@ -7,5 +7,23 @@ import com.intellij.openapi.project.Project
   * @author Maris Alexandru
   */
 object HydraCompilerSettingsManager {
+
+  private val HydraLogKey = "hydra.logFile"
+
   def showHydraCompileSettingsDialog(project: Project): Unit = ShowSettingsUtil.getInstance().showSettingsDialog(project, "Hydra Compiler")
+
+  def getHydraLogJvmParameter(project: Project): String = {
+    val settings = HydraCompilerSettings.getInstance(project)
+    if (settings.isHydraEnabled)
+      s"-Dhydra.logFile=${settings.hydraLogLocation}"
+    else
+      ""
+  }
+
+  def setHydraLogSystemProperty(project: Project): Unit = {
+    if (System.getProperty(HydraLogKey) == null) {
+      val settings = HydraCompilerSettings.getInstance(project)
+      System.setProperty(HydraLogKey, settings.hydraLogLocation)
+    }
+  }
 }
diff --git a/...-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala b/...-impl/src/org/jetbrains/plugins/hydra/compiler/ScalaHydraCompilerConfigurationPanel.scala
@@ -26,6 +26,8 @@ class ScalaHydraCompilerConfigurationPanel(project: Project, settings: HydraComp
 
   hydraGlobalSettings.getState
 
+  HydraCompilerSettingsManager.setHydraLogSystemProperty(project)
+
   hydraRepository.setText(hydraGlobalSettings.getHydraRepositoryUrl)
   hydraRepository.getDocument.addDocumentListener(documentAdapter)
 

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/compiler/CompileServerLauncher.scala b/scala/scala-impl/src/org/jetbrains/plugins/scala/compiler/CompileServerLauncher.scala
@@ -5,7 +5,7 @@ import java.io.{File, IOException}
 import javax.swing.event.HyperlinkEvent
 
 import com.intellij.compiler.server.BuildManager
-import com.intellij.ide.plugins.{PluginManager, IdeaPluginDescriptor}
+import com.intellij.ide.plugins.{IdeaPluginDescriptor, PluginManager}
 import com.intellij.notification.{Notification, NotificationListener, NotificationType, Notifications}
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.ApplicationComponent
@@ -20,6 +20,7 @@ import com.intellij.util.PathUtil
 import com.intellij.util.net.NetUtils
 import gnu.trove.TByteArrayList
 import org.jetbrains.jps.incremental.BuilderService
+import org.jetbrains.plugins.hydra.compiler.HydraCompilerSettingsManager
 import org.jetbrains.plugins.scala.compiler.CompileServerLauncher._
 import org.jetbrains.plugins.scala.extensions._
 import org.jetbrains.plugins.scala.project.{Platform, ProjectExt}
@@ -109,7 +110,7 @@ class CompileServerLauncher extends ApplicationComponent {
         } else Nil
 
         val commands = jdk.executable.canonicalPath +: bootclasspathArg ++: "-cp" +: classpath +: jvmParameters ++: shutdownDelayArg ++:
-                ngRunnerFqn +: freePort.toString +: id.toString +: Nil
+          HydraCompilerSettingsManager.getHydraLogJvmParameter(project) +: ngRunnerFqn +: freePort.toString +: id.toString +: Nil
 
         val builder = new ProcessBuilder(commands.asJava)