Merge pull request #20 from TibbyRocks/bugfix/fix-logging

Fix logging in the utils package for real this time

bot.go

@@ -25,7 +25,7 @@ var (
 	log                = utils.Log
 	unregisterCommands = flag.Bool("unregister", false, "Use this flag to unregister all registered bot commands")
 	debugMode          = flag.Bool("debug", false, "Use this flag to enable debug mode")
-	customs            = utils.BotCustoms
+	customs            = &utils.BotCustoms
 	dc                 *discordgo.Session
 	err                error
 )
@@ -193,10 +193,10 @@ func init() {
 	} else {
 		log.Debug("Loaded .env file(s)")
 	}
+	utils.LoadCustoms()
 }
 
 func main() {
-
 	log.Info("Starting " + customs.BotName)
 
 	setupDiscordSession()

internal/utils/customization.go

@@ -15,25 +15,26 @@ type CustomizationOptions struct {
 }
 
 var BotCustoms CustomizationOptions
-var log = Log
 
-func init() {
+func LoadCustoms() {
 	customsFile, err := os.Open("customizations/botproperties.json")
 	if err != nil {
-		log.Error("Couldn't load customizations file: " + err.Error())
+		Log.Error("Couldn't load customizations file: " + err.Error())
+		os.Exit(1)
 	}
 
 	jsonParser := json.NewDecoder(customsFile)
 	if err = jsonParser.Decode(&BotCustoms); err != nil {
-		log.Error("Couldn't parse customizations file: " + err.Error())
+		Log.Error("Couldn't parse customizations file: " + err.Error())
+		os.Exit(1)
 	}
 }
 
 func GetCdnUri(fileName string) string {
 	if val, ok := BotCustoms.CDN.Files[fileName]; ok {
 		return BotCustoms.CDN.BaseURL + val
 	} else {
-		log.Error("Couldn't file an customization entry for the file " + fileName)
+		Log.Error("Couldn't file an customization entry for the file " + fileName)
 	}
 	return ""
 }

internal/utils/files.go

@@ -9,7 +9,7 @@ func FileToSlice(inputFile string) []string {
 	var lines []string
 	file, err := os.Open(inputFile)
 	if err != nil {
-		log.Error(err.Error())
+		Log.Error(err.Error())
 	}
 	defer file.Close()
 
@@ -19,7 +19,7 @@ func FileToSlice(inputFile string) []string {
 	}
 
 	if err := scanner.Err(); err != nil {
-		log.Error(err.Error())
+		Log.Error(err.Error())
 	}
 
 	return lines