From 333f0596dce686db43dd16800c2ad8e95f0c7cb4 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:46:53 +0100
Subject: [PATCH] Fix race condition

---
 internal/log.go      | 2 ++
 internal/log_unix.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/internal/log.go b/internal/log.go
index d7e852c81..da6e20418 100644
--- a/internal/log.go
+++ b/internal/log.go
@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync"
 
 	"github.com/matrix-org/util"
 
@@ -37,6 +38,7 @@ import (
 // this unfortunately results in us adding the same hook multiple times.
 // This map ensures we only ever add one level hook.
 var stdLevelLogAdded = make(map[logrus.Level]bool)
+var levelLogAddedMu = &sync.Mutex{}
 
 type utcFormatter struct {
 	logrus.Formatter
diff --git a/internal/log_unix.go b/internal/log_unix.go
index b38e7c2e8..8f34c320d 100644
--- a/internal/log_unix.go
+++ b/internal/log_unix.go
@@ -85,6 +85,8 @@ func checkSyslogHookParams(params map[string]interface{}) {
 }
 
 func setupStdLogHook(level logrus.Level) {
+	levelLogAddedMu.Lock()
+	defer levelLogAddedMu.Unlock()
 	if stdLevelLogAdded[level] {
 		return
 	}