Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix init order of logger and config
Check if .env file exists
  • Loading branch information
MineGame159 committed Sep 9, 2024
commit 8274ee54e88a643ccc63dd54e39eb7a31605bee9
9 changes: 7 additions & 2 deletions cmd/meteor-bot/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ import (
"github.com/bwmarrin/discordgo"
"github.com/rs/zerolog/log"
"meteor-bot/internal/app/commands"
"meteor-bot/internal/app/common"
"meteor-bot/internal/app/config"
"meteor-bot/internal/app/events"
"os"
"os/signal"
)

func main() {
// Close the log file when the program exits
defer config.CloseLogFile()
// Initialize the logger
common.InitLogger()
defer common.CloseLogger()

// Initialize config
config.Init()

// Create a new Discord session
s, err := discordgo.New("Bot " + config.GlobalConfig.DiscordToken)
Expand Down
19 changes: 12 additions & 7 deletions internal/app/config/logger.go → internal/app/common/logger.go
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package config
package common

import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"meteor-bot/internal/app/config"
"os"
"path"
"time"
)

// logFile is the file to write logs to
var logFile *os.File

func init() {
func InitLogger() {
zerolog.TimeFieldFormat = zerolog.TimeFormatUnix

if GlobalConfig.EnableLogFile {
if config.GlobalConfig.EnableLogFile {
var err error
logFile, err = os.OpenFile(
path.Join("logs", "meteor-bot.log"),
Expand All @@ -30,13 +32,16 @@ func init() {
// Set the default logger to write to both console and file
log.Logger = zerolog.New(multi).With().Timestamp().Logger()
} else {
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout})
log.Logger = log.Output(zerolog.ConsoleWriter{
Out: os.Stdout,
TimeFormat: time.TimeOnly,
})
}
log.Debug().Msg("Logger initialized")

log.Info().Msg("Logger initialized")
}

// CloseLogFile closes the log file
func CloseLogFile() {
func CloseLogger() {
if logFile != nil {
if err := logFile.Close(); err != nil {
log.Error().Err(err).Msg("Failed to close log file")
Expand Down
13 changes: 10 additions & 3 deletions internal/app/config/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package config

import (
"errors"
"github.com/joho/godotenv"
"github.com/rs/zerolog/log"
"os"
Expand All @@ -22,9 +23,13 @@ type Env struct {
EnableLogFile bool // Enable logging to a file
}

func init() {
if err := godotenv.Load(); err != nil {
log.Warn().Err(err).Msg("Error loading .env file")
func Init() {
if _, err := os.Stat(".env"); errors.Is(err, os.ErrNotExist) {
log.Warn().Msg(".env file not found, using current environment")
} else {
if err := godotenv.Load(); err != nil {
log.Panic().Err(err).Msg("Error loading .env file")
}
}

GlobalConfig = Env{
Expand All @@ -39,4 +44,6 @@ func init() {
UptimeUrl: os.Getenv("UPTIME_URL"),
EnableLogFile: os.Getenv("ENABLE_LOG_FILE") == "true",
}

log.Info().Msg("Config initialized")
}