diff --git a/samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt b/samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt index 3ea65cd07e..68e472fb6b 100644 --- a/samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt +++ b/samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt @@ -94,7 +94,6 @@ data class SpringBootDriverDSL(private val driverDSL: DriverDSLImpl) : InternalD ), classpath = ProcessUtilities.defaultClassPath, workingDirectory = handle.baseDirectory, - errorLogPath = Paths.get("error.$className.log"), arguments = listOf( "--base-directory", handle.baseDirectory.toString(), "--server.port=${(handle as NodeHandleInternal).webAddress.port}", diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt index 8683d2be2a..ee96e62db0 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt @@ -853,7 +853,6 @@ class DriverDSLImpl( arguments = arguments, jdwpPort = debugPort, extraJvmArguments = extraJvmArguments + listOfNotNull(jolokiaAgent), - errorLogPath = config.corda.baseDirectory / NodeStartup.LOGS_DIRECTORY_NAME / "error.log", workingDirectory = config.corda.baseDirectory, maximumHeapSize = maximumHeapSize ) @@ -870,7 +869,6 @@ class DriverDSLImpl( "-Dname=node-${handle.p2pAddress}-webserver", "-Djava.io.tmpdir=${System.getProperty("java.io.tmpdir")}" // Inherit from parent process ), - errorLogPath = Paths.get("error.$className.log"), workingDirectory = null, maximumHeapSize = maximumHeapSize ) diff --git a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt index 46a5638319..a280ec1383 100644 --- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt +++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt @@ -21,7 +21,7 @@ object ProcessUtilities { jdwpPort: Int? = null, extraJvmArguments: List = emptyList() ): Process { - return startJavaProcessImpl(C::class.java.name, arguments, defaultClassPath, jdwpPort, extraJvmArguments, null, null, null) + return startJavaProcessImpl(C::class.java.name, arguments, defaultClassPath, jdwpPort, extraJvmArguments, null, null) } fun startCordaProcess( @@ -29,13 +29,12 @@ object ProcessUtilities { arguments: List, jdwpPort: Int?, extraJvmArguments: List, - errorLogPath: Path?, workingDirectory: Path?, maximumHeapSize: String ): Process { // FIXME: Instead of hacking our classpath, use the correct classpath for className. val classpath = defaultClassPath.split(pathSeparator).filter { !(it / "log4j2-test.xml").exists() }.joinToString(pathSeparator) - return startJavaProcessImpl(className, arguments, classpath, jdwpPort, extraJvmArguments, errorLogPath, workingDirectory, maximumHeapSize) + return startJavaProcessImpl(className, arguments, classpath, jdwpPort, extraJvmArguments, workingDirectory, maximumHeapSize) } fun startJavaProcessImpl( @@ -44,7 +43,6 @@ object ProcessUtilities { classpath: String, jdwpPort: Int?, extraJvmArguments: List, - errorLogPath: Path?, workingDirectory: Path?, maximumHeapSize: String? ): Process {