aboutsummaryrefslogtreecommitdiffstats
path: root/modules/log
diff options
context:
space:
mode:
Diffstat (limited to 'modules/log')
-rw-r--r--modules/log/colors.go8
-rw-r--r--modules/log/conn.go5
-rw-r--r--modules/log/conn_test.go1
-rw-r--r--modules/log/event.go4
-rw-r--r--modules/log/file.go4
-rw-r--r--modules/log/file_test.go8
-rw-r--r--modules/log/flags.go2
-rw-r--r--modules/log/log.go2
-rw-r--r--modules/log/smtp.go4
-rw-r--r--modules/log/writer.go5
10 files changed, 18 insertions, 25 deletions
diff --git a/modules/log/colors.go b/modules/log/colors.go
index 0ec8ce4ba8..c29741634f 100644
--- a/modules/log/colors.go
+++ b/modules/log/colors.go
@@ -208,7 +208,7 @@ normalLoop:
if i > lasti {
written, err := c.w.Write(bytes[lasti:i])
- totalWritten = totalWritten + written
+ totalWritten += written
if err != nil {
return totalWritten, err
}
@@ -243,7 +243,7 @@ normalLoop:
if bytes[j] == 'm' {
if c.mode == allowColor {
written, err := c.w.Write(bytes[i : j+1])
- totalWritten = totalWritten + written
+ totalWritten += written
if err != nil {
return totalWritten, err
}
@@ -278,7 +278,7 @@ func ColorSprintf(format string, args ...interface{}) string {
}
return fmt.Sprintf(format, v...)
}
- return fmt.Sprintf(format)
+ return format
}
// ColorFprintf will write to the provided writer similar to ColorSprintf
@@ -290,7 +290,7 @@ func ColorFprintf(w io.Writer, format string, args ...interface{}) (int, error)
}
return fmt.Fprintf(w, format, v...)
}
- return fmt.Fprintf(w, format)
+ return fmt.Fprint(w, format)
}
// ColorFormatted structs provide their own colored string when formatted with ColorSprintf
diff --git a/modules/log/conn.go b/modules/log/conn.go
index bd76855168..8816664526 100644
--- a/modules/log/conn.go
+++ b/modules/log/conn.go
@@ -67,7 +67,10 @@ func (i *connWriter) connect() error {
}
if tcpConn, ok := conn.(*net.TCPConn); ok {
- tcpConn.SetKeepAlive(true)
+ err = tcpConn.SetKeepAlive(true)
+ if err != nil {
+ return err
+ }
}
i.innerWriter = conn
diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
index 380a115d96..cc3d758fa9 100644
--- a/modules/log/conn_test.go
+++ b/modules/log/conn_test.go
@@ -24,7 +24,6 @@ func listenReadAndClose(t *testing.T, l net.Listener, expected string) {
assert.NoError(t, err)
assert.Equal(t, expected, string(written))
- return
}
func TestConnLogger(t *testing.T) {
diff --git a/modules/log/event.go b/modules/log/event.go
index 2ec1f9587d..37efa3c230 100644
--- a/modules/log/event.go
+++ b/modules/log/event.go
@@ -79,7 +79,7 @@ func (l *ChannelledLog) Start() {
return
}
l.loggerProvider.Flush()
- case _, _ = <-l.close:
+ case <-l.close:
l.closeLogger()
return
}
@@ -104,7 +104,6 @@ func (l *ChannelledLog) closeLogger() {
l.loggerProvider.Flush()
l.loggerProvider.Close()
l.closed <- true
- return
}
// Close this ChannelledLog
@@ -228,7 +227,6 @@ func (m *MultiChannelledLog) closeLoggers() {
}
m.mutex.Unlock()
m.closed <- true
- return
}
// Start processing the MultiChannelledLog
diff --git a/modules/log/file.go b/modules/log/file.go
index cdda85d626..877820b8be 100644
--- a/modules/log/file.go
+++ b/modules/log/file.go
@@ -223,7 +223,7 @@ func compressOldLogFile(fname string, compressionLevel int) error {
func (log *FileLogger) deleteOldLog() {
dir := filepath.Dir(log.Filename)
- filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) {
+ _ = filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) {
defer func() {
if r := recover(); r != nil {
returnErr = fmt.Errorf("Unable to delete old log '%s', error: %+v", path, r)
@@ -246,7 +246,7 @@ func (log *FileLogger) deleteOldLog() {
// there are no buffering messages in file logger in memory.
// flush file means sync file from disk.
func (log *FileLogger) Flush() {
- log.mw.fd.Sync()
+ _ = log.mw.fd.Sync()
}
// GetName returns the default name for this implementation
diff --git a/modules/log/file_test.go b/modules/log/file_test.go
index 648db6f393..38279315ab 100644
--- a/modules/log/file_test.go
+++ b/modules/log/file_test.go
@@ -103,7 +103,7 @@ func TestFileLogger(t *testing.T) {
assert.Equal(t, expected, string(logData))
event.level = WARN
- expected = expected + fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
+ expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
@@ -130,7 +130,7 @@ func TestFileLogger(t *testing.T) {
err = realFileLogger.DoRotate()
assert.Error(t, err)
- expected = expected + fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
+ expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
@@ -138,7 +138,7 @@ func TestFileLogger(t *testing.T) {
assert.Equal(t, expected, string(logData))
// Should fail to rotate
- expected = expected + fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
+ expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
@@ -188,7 +188,7 @@ func TestCompressFileLogger(t *testing.T) {
assert.Equal(t, expected, string(logData))
event.level = WARN
- expected = expected + fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
+ expected += fmt.Sprintf("%s%s %s:%d:%s [%c] %s\n", prefix, dateString, event.filename, event.line, event.caller, strings.ToUpper(event.level.String())[0], event.msg)
fileLogger.LogEvent(&event)
fileLogger.Flush()
logData, err = ioutil.ReadFile(filename)
diff --git a/modules/log/flags.go b/modules/log/flags.go
index 928d42b965..992fc62ddb 100644
--- a/modules/log/flags.go
+++ b/modules/log/flags.go
@@ -57,7 +57,7 @@ func FlagsFromString(from string) int {
for _, flag := range strings.Split(strings.ToLower(from), ",") {
f, ok := flagFromString[strings.TrimSpace(flag)]
if ok {
- flags = flags | f
+ flags |= f
}
}
return flags
diff --git a/modules/log/log.go b/modules/log/log.go
index 8698e9eed3..0ca0f3adc5 100644
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -218,7 +218,7 @@ func (l *LoggerAsWriter) Write(p []byte) (int, error) {
func (l *LoggerAsWriter) Log(msg string) {
for _, logger := range l.ourLoggers {
// Set the skip to reference the call just above this
- logger.Log(1, l.level, msg)
+ _ = logger.Log(1, l.level, msg)
}
}
diff --git a/modules/log/smtp.go b/modules/log/smtp.go
index f77d716d94..f912299a73 100644
--- a/modules/log/smtp.go
+++ b/modules/log/smtp.go
@@ -11,10 +11,6 @@ import (
"strings"
)
-const (
- subjectPhrase = "Diagnostic message from server"
-)
-
type smtpWriter struct {
owner *SMTPLogger
}
diff --git a/modules/log/writer.go b/modules/log/writer.go
index 22ef0b9047..2503f04d76 100644
--- a/modules/log/writer.go
+++ b/modules/log/writer.go
@@ -252,10 +252,7 @@ func (logger *WriterLogger) Match(event *Event) bool {
mode: removeColor,
}).Write([]byte(event.msg))
msg = baw
- if logger.regexp.Match(msg) {
- return true
- }
- return false
+ return logger.regexp.Match(msg)
}
// Close the base logger
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 18:06:00 +0000