diff --git a/main.go b/main.go index 0449386..efa4762 100644 --- a/main.go +++ b/main.go @@ -40,8 +40,15 @@ func main() { // Сообщение в лог о количестве элементов в кэше tools.Ticker(func() { - log.Printf("Number of pages in cache: %d", len(app.PagesCache.Data)) - }, time.Minute*30) + log.Println("Pages in cache:") + if len(app.PagesCache.Data) != 0 { + for key := range app.PagesCache.Data { + log.Println(key) + } + } else { + log.Println("No pages in the cache") + } + }, time.Second*app.Cfg.CacheLogInterval) } // Запуск сервера diff --git a/mvc/controllers/controllers_pages/main.go b/mvc/controllers/controllers_pages/main.go index ed569e3..c2810f8 100644 --- a/mvc/controllers/controllers_pages/main.go +++ b/mvc/controllers/controllers_pages/main.go @@ -22,7 +22,7 @@ func MainPageHandler(app *models.App) http.HandlerFunc { // Количество запросов, обработанных сервером за 24ч if r.Method == "COUNT" { var count []byte - if count, err = tools.GetJournalctlLogsCount("server", app.Cfg.ServerDomain, 24); err != nil { + if count, err = tools.GetJournalctlLogsCount("server", "duration: ", 24); err != nil { log.Printf("%s", err.Error()) } sendCount(w, count) diff --git a/mvc/models/config.go b/mvc/models/config.go index 0925532..0c7b74a 100644 --- a/mvc/models/config.go +++ b/mvc/models/config.go @@ -25,6 +25,7 @@ type Config struct { LastFMUsername string LastFMToken string LastFMUpdateInterval time.Duration + CacheLogInterval time.Duration } func loadConfig(configPath string) (*Config, error) {