From 0c74a850b5f59e4e6b865a06eeb652f0aeb10d10 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Thu, 6 May 2021 14:04:47 -0700 Subject: [PATCH] Make storedir consistent with mix of flags etc --- server/jetstream.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/jetstream.go b/server/jetstream.go index 595092b4..c768c8f2 100644 --- a/server/jetstream.go +++ b/server/jetstream.go @@ -154,8 +154,10 @@ func (s *Server) EnableJetStream(config *JetStreamConfig) error { config.Domain = domain } s.Debugf("JetStream creating dynamic configuration - %s memory, %s disk", friendlyBytes(config.MaxMemory), friendlyBytes(config.MaxStore)) + } else if config != nil && config.StoreDir != _EMPTY_ { + config.StoreDir = filepath.Join(config.StoreDir, JetStreamStoreDir) } - // Copy, don't change callers version. + cfg := *config if cfg.StoreDir == _EMPTY_ { cfg.StoreDir = filepath.Join(os.TempDir(), JetStreamStoreDir)