Change summary
config.go | 5 ++---
main.go | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
Detailed changes
@@ -1,7 +1,6 @@
package main
import (
- "fmt"
"io/ioutil"
"log"
"os"
@@ -12,14 +11,14 @@ import (
func parseConfig(configFile *string) {
configBytes, err := ioutil.ReadFile(*configFile)
if err != nil {
- log.Println("Config file note found, writing default values to config.yaml")
+ log.Println("Config file not found, writing default values to config.yaml")
writeDefaultConfig()
os.Exit(0)
}
config := make(map[interface{}]interface{})
err = yaml.Unmarshal(configBytes, &config)
for k, v := range config {
- fmt.Printf("%s -> %s\n", k, v)
+ log.Printf("%s -> %s\n", k, v)
}
}
@@ -2,7 +2,6 @@ package main
import (
"embed"
- "fmt"
"log"
"net/http"
@@ -30,12 +29,13 @@ type config struct {
func init() {
flag.Parse()
- fmt.Println("Listening on", *flagListen)
- fmt.Println("Reading config at", *flagConfig)
+ log.Println("Reading config at", *flagConfig)
+ parseConfig(&*flagConfig)
+ log.Println("Listening on", *flagListen)
if *flagAccessToken == "CHANGEME" {
log.Fatalln("Access token *must* be defined, either by flag or config file.")
}
- fmt.Println("Reading database at", *flagDatabase+"/")
+ log.Println("Reading database at", *flagDatabase+"/")
}
func main() {