From 257eaa077a87d80163fa34217afbda3e97b988ee Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 19 Feb 2020 22:12:38 +0200 Subject: Only initialize history manager if not initialized --- matrix/matrix.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'matrix/matrix.go') diff --git a/matrix/matrix.go b/matrix/matrix.go index c33a749..c89f884 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -34,6 +34,8 @@ import ( dbg "runtime/debug" "time" + "github.com/pkg/errors" + "maunium.net/go/gomuks/lib/open" "maunium.net/go/gomuks/matrix/event" "maunium.net/go/mautrix" @@ -108,9 +110,11 @@ func (c *Container) InitClient() error { } c.client.Logger = mxLogger{} - c.history, err = NewHistoryManager(c.config.HistoryPath) - if err != nil { - return err + if c.history == nil { + c.history, err = NewHistoryManager(c.config.HistoryPath) + if err != nil { + return errors.Wrap(err, "failed to initialize history") + } } allowInsecure := len(os.Getenv("GOMUKS_ALLOW_INSECURE_CONNECTIONS")) > 0 -- cgit v1.2.3