mirror of
https://github.com/corda/corda.git
synced 2025-03-17 17:45:17 +00:00
Merge remote-tracking branch 'remotes/origin/tudor_merge_14_05_2018' into merges/may-14-15-21
# Conflicts: # node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
This commit is contained in:
commit
abc630fca4
@ -46,13 +46,12 @@ object ConfigHelper {
|
||||
val appConfig = ConfigFactory.parseFile(configFile.toFile(), parseOptions.setAllowMissing(allowMissingConfig))
|
||||
val databaseConfig = ConfigFactory.parseResources(System.getProperty("custom.databaseProvider")+".conf", parseOptions.setAllowMissing(true))
|
||||
|
||||
val systemOverrides = systemProperties().cordaEntriesOnly()
|
||||
val environmentOverrides = systemEnvironment().cordaEntriesOnly()
|
||||
|
||||
// Detect the underlying OS. If mac or windows non-server then we assume we're running in devMode. Unless specified otherwise.
|
||||
val smartDevMode = CordaSystemUtils.isOsMac() || (CordaSystemUtils.isOsWindows() && !CordaSystemUtils.getOsName().toLowerCase().contains("server"))
|
||||
val devModeConfig = ConfigFactory.parseMap(mapOf("devMode" to smartDevMode))
|
||||
|
||||
val systemOverrides = systemProperties().cordaEntriesOnly()
|
||||
val environmentOverrides = systemEnvironment().cordaEntriesOnly()
|
||||
val finalConfig = configOverrides
|
||||
// Add substitution values here
|
||||
.withFallback(configOf("custom.nodeOrganizationName" to parseToDbSchemaFriendlyName(baseDirectory.fileName.toString()))) //for database integration tests
|
||||
|
Loading…
x
Reference in New Issue
Block a user