aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorS7evinK <tfaelligen@gmail.com>2021-11-02 17:50:59 +0100
committerGitHub <noreply@github.com>2021-11-02 16:50:59 +0000
commit0c2872828b7b8aa06a9c6be2c7a5ac0ce119fb6b (patch)
tree90861b961efcd1758c2ff84785ee96173a936827 /internal
parentdec05c334707346506a979e1cdb3b295dbad5c4f (diff)
Fix building on Windows (#2008)
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
Diffstat (limited to 'internal')
-rw-r--r--internal/log.go61
-rw-r--r--internal/log_unix.go84
-rw-r--r--internal/log_windows.go48
3 files changed, 132 insertions, 61 deletions
diff --git a/internal/log.go b/internal/log.go
index f0656d7d..bba0ac6e 100644
--- a/internal/log.go
+++ b/internal/log.go
@@ -18,7 +18,6 @@ import (
"context"
"fmt"
"io"
- "log/syslog"
"net/http"
"os"
"path"
@@ -31,7 +30,6 @@ import (
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dugong"
"github.com/sirupsen/logrus"
- lSyslog "github.com/sirupsen/logrus/hooks/syslog"
)
type utcFormatter struct {
@@ -108,37 +106,6 @@ func SetupStdLogging() {
})
}
-// SetupHookLogging configures the logging hooks defined in the configuration.
-// If something fails here it means that the logging was improperly configured,
-// so we just exit with the error
-func SetupHookLogging(hooks []config.LogrusHook, componentName string) {
- logrus.SetReportCaller(true)
- for _, hook := range hooks {
- // Check we received a proper logging level
- level, err := logrus.ParseLevel(hook.Level)
- if err != nil {
- logrus.Fatalf("Unrecognised logging level %s: %q", hook.Level, err)
- }
-
- // Perform a first filter on the logs according to the lowest level of all
- // (Eg: If we have hook for info and above, prevent logrus from processing debug logs)
- if logrus.GetLevel() < level {
- logrus.SetLevel(level)
- }
-
- switch hook.Type {
- case "file":
- checkFileHookParams(hook.Params)
- setupFileHook(hook, level, componentName)
- case "syslog":
- checkSyslogHookParams(hook.Params)
- setupSyslogHook(hook, level, componentName)
- default:
- logrus.Fatalf("Unrecognised logging hook type: %s", hook.Type)
- }
- }
-}
-
// File type hooks should be provided a path to a directory to store log files
func checkFileHookParams(params map[string]interface{}) {
path, ok := params["path"]
@@ -178,34 +145,6 @@ func setupFileHook(hook config.LogrusHook, level logrus.Level, componentName str
})
}
-func checkSyslogHookParams(params map[string]interface{}) {
- addr, ok := params["address"]
- if !ok {
- logrus.Fatalf("Expecting a parameter \"address\" for logging hook of type \"syslog\"")
- }
-
- if _, ok := addr.(string); !ok {
- logrus.Fatalf("Parameter \"address\" for logging hook of type \"syslog\" should be a string")
- }
-
- proto, ok2 := params["protocol"]
- if !ok2 {
- logrus.Fatalf("Expecting a parameter \"protocol\" for logging hook of type \"syslog\"")
- }
-
- if _, ok2 := proto.(string); !ok2 {
- logrus.Fatalf("Parameter \"protocol\" for logging hook of type \"syslog\" should be a string")
- }
-
-}
-
-func setupSyslogHook(hook config.LogrusHook, level logrus.Level, componentName string) {
- syslogHook, err := lSyslog.NewSyslogHook(hook.Params["protocol"].(string), hook.Params["address"].(string), syslog.LOG_INFO, componentName)
- if err == nil {
- logrus.AddHook(&logLevelHook{level, syslogHook})
- }
-}
-
//CloseAndLogIfError Closes io.Closer and logs the error if any
func CloseAndLogIfError(ctx context.Context, closer io.Closer, message string) {
if closer == nil {
diff --git a/internal/log_unix.go b/internal/log_unix.go
new file mode 100644
index 00000000..25ad0420
--- /dev/null
+++ b/internal/log_unix.go
@@ -0,0 +1,84 @@
+// Copyright 2021 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !windows
+
+package internal
+
+import (
+ "log/syslog"
+
+ "github.com/matrix-org/dendrite/setup/config"
+ "github.com/sirupsen/logrus"
+ lSyslog "github.com/sirupsen/logrus/hooks/syslog"
+)
+
+// SetupHookLogging configures the logging hooks defined in the configuration.
+// If something fails here it means that the logging was improperly configured,
+// so we just exit with the error
+func SetupHookLogging(hooks []config.LogrusHook, componentName string) {
+ logrus.SetReportCaller(true)
+ for _, hook := range hooks {
+ // Check we received a proper logging level
+ level, err := logrus.ParseLevel(hook.Level)
+ if err != nil {
+ logrus.Fatalf("Unrecognised logging level %s: %q", hook.Level, err)
+ }
+
+ // Perform a first filter on the logs according to the lowest level of all
+ // (Eg: If we have hook for info and above, prevent logrus from processing debug logs)
+ if logrus.GetLevel() < level {
+ logrus.SetLevel(level)
+ }
+
+ switch hook.Type {
+ case "file":
+ checkFileHookParams(hook.Params)
+ setupFileHook(hook, level, componentName)
+ case "syslog":
+ checkSyslogHookParams(hook.Params)
+ setupSyslogHook(hook, level, componentName)
+ default:
+ logrus.Fatalf("Unrecognised logging hook type: %s", hook.Type)
+ }
+ }
+}
+
+func checkSyslogHookParams(params map[string]interface{}) {
+ addr, ok := params["address"]
+ if !ok {
+ logrus.Fatalf("Expecting a parameter \"address\" for logging hook of type \"syslog\"")
+ }
+
+ if _, ok := addr.(string); !ok {
+ logrus.Fatalf("Parameter \"address\" for logging hook of type \"syslog\" should be a string")
+ }
+
+ proto, ok2 := params["protocol"]
+ if !ok2 {
+ logrus.Fatalf("Expecting a parameter \"protocol\" for logging hook of type \"syslog\"")
+ }
+
+ if _, ok2 := proto.(string); !ok2 {
+ logrus.Fatalf("Parameter \"protocol\" for logging hook of type \"syslog\" should be a string")
+ }
+
+}
+
+func setupSyslogHook(hook config.LogrusHook, level logrus.Level, componentName string) {
+ syslogHook, err := lSyslog.NewSyslogHook(hook.Params["protocol"].(string), hook.Params["address"].(string), syslog.LOG_INFO, componentName)
+ if err == nil {
+ logrus.AddHook(&logLevelHook{level, syslogHook})
+ }
+}
diff --git a/internal/log_windows.go b/internal/log_windows.go
new file mode 100644
index 00000000..39562328
--- /dev/null
+++ b/internal/log_windows.go
@@ -0,0 +1,48 @@
+// Copyright 2021 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+ "github.com/matrix-org/dendrite/setup/config"
+ "github.com/sirupsen/logrus"
+)
+
+// SetupHookLogging configures the logging hooks defined in the configuration.
+// If something fails here it means that the logging was improperly configured,
+// so we just exit with the error
+func SetupHookLogging(hooks []config.LogrusHook, componentName string) {
+ logrus.SetReportCaller(true)
+ for _, hook := range hooks {
+ // Check we received a proper logging level
+ level, err := logrus.ParseLevel(hook.Level)
+ if err != nil {
+ logrus.Fatalf("Unrecognised logging level %s: %q", hook.Level, err)
+ }
+
+ // Perform a first filter on the logs according to the lowest level of all
+ // (Eg: If we have hook for info and above, prevent logrus from processing debug logs)
+ if logrus.GetLevel() < level {
+ logrus.SetLevel(level)
+ }
+
+ switch hook.Type {
+ case "file":
+ checkFileHookParams(hook.Params)
+ setupFileHook(hook, level, componentName)
+ default:
+ logrus.Fatalf("Unrecognised logging hook type: %s", hook.Type)
+ }
+ }
+}