LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Limit number of log entries returned. Closes #423

Browse Source
This commit is contained in:
Gabe Kangas 2020-12-05 16:55:19 -08:00
parent 4a4639a523
commit 40e63546cb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/admin/logs.go
View File

@ -32,7 +32,10 @@ func GetWarnings(w http.ResponseWriter, r *http.Request) {
response := make([]logsResponse, 0) response := make([]logsResponse, 0)
for i := 0; i < len(logs); i++ { for i := 0; i < len(logs); i++ {
response = append(response, fromEntry(logs[i])) logEntry := logs[i]
if logEntry != nil {
response = append(response, fromEntry(logEntry))
}
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")

17
logging/logging.go
View File

@ -4,6 +4,7 @@ package logging
// Modeled after https://github.com/sirupsen/logrus/blob/master/hooks/test/test.go // Modeled after https://github.com/sirupsen/logrus/blob/master/hooks/test/test.go
import ( import (
"math"
"os" "os"
"sync" "sync"
@ -53,11 +54,13 @@ func (l *OCLogger) Levels() []logrus.Level {
func (l *OCLogger) AllEntries() []*logrus.Entry { func (l *OCLogger) AllEntries() []*logrus.Entry {
l.mu.RLock() l.mu.RLock()
defer l.mu.RUnlock() defer l.mu.RUnlock()
// Make a copy so the returned value won't race with future log requests // Make a copy so the returned value won't race with future log requests
entries := make([]*logrus.Entry, len(l.Entries)) logCount := int(math.Min(float64(len(l.Entries)), 800.0))
for i := 0; i < len(l.Entries); i++ { entries := make([]*logrus.Entry, logCount)
for i := 0; i < len(entries); i++ {
// Make a copy, for safety // Make a copy, for safety
entries[i] = &l.Entries[i] entries[len(entries)-logCount:][i] = &l.Entries[i]
} }
return entries return entries
@ -67,12 +70,14 @@ func (l *OCLogger) AllEntries() []*logrus.Entry {
func (l *OCLogger) WarningEntries() []*logrus.Entry { func (l *OCLogger) WarningEntries() []*logrus.Entry {
l.mu.RLock() l.mu.RLock()
defer l.mu.RUnlock() defer l.mu.RUnlock()
// Make a copy so the returned value won't race with future log requests // Make a copy so the returned value won't race with future log requests
entries := make([]*logrus.Entry, 0) logCount := int(math.Min(float64(len(l.Entries)), 100.0))
for i := 0; i < len(l.Entries); i++ { entries := make([]*logrus.Entry, logCount)
for i := 0; i < len(entries); i++ {
if l.Entries[i].Level <= logrus.WarnLevel { if l.Entries[i].Level <= logrus.WarnLevel {
// Make a copy, for safety // Make a copy, for safety
entries = append(entries, &l.Entries[i]) entries[len(entries)-logCount:][i] = &l.Entries[i]
} }
} }