Skip to content

Commit 6320a37

Browse files
committed
remove System.getProperty
1 parent d836f03 commit 6320a37

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import reactor.core.Disposable
4343
import reactor.core.publisher.Flux
4444
import reactor.core.scheduler.Schedulers
4545
import java.time.Clock
46-
import java.util.UUID
4746
import java.util.concurrent.BlockingQueue
4847
import java.util.concurrent.Executor
4948
import java.util.concurrent.ExecutorService
@@ -226,8 +225,7 @@ class ControlPlane private constructor(
226225
groupChangeWatcher,
227226
executorGroup,
228227
cachedProtoResourcesSerializer,
229-
System.getProperty(properties.envoy.controlPlaneIdentifierEnv) ?: UUID.randomUUID().toString()
230-
228+
properties.envoy.controlPlaneIdentifier
231229
)
232230
}
233231

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package pl.allegro.tech.servicemesh.envoycontrol
55
import pl.allegro.tech.servicemesh.envoycontrol.server.ServerProperties
66
import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotProperties
77
import pl.allegro.tech.servicemesh.envoycontrol.synchronization.SyncProperties
8+
import java.util.UUID
89

910
class EnvoyControlProperties {
1011
var server = ServerProperties()
@@ -15,7 +16,7 @@ class EnvoyControlProperties {
1516

1617
class EnvoyProperties {
1718
var snapshot = SnapshotProperties()
18-
var controlPlaneIdentifierEnv = "HOST"
19+
var controlPlaneIdentifier = UUID.randomUUID().toString()
1920
}
2021

2122
class ServiceFilters {

0 commit comments

Comments
 (0)