Browse Source

loadLanguages returns status

Piotr Czajkowski 3 years ago
parent
commit
f99e47c099
3 changed files with 16 additions and 5 deletions
  1. 10 3
      app.go
  2. 3 1
      app_test.go
  3. 3 1
      server.go

+ 10 - 3
app.go

@@ -30,15 +30,22 @@ func jsonDecoder(data io.ReadCloser, target interface{}) error {
 	return decoder.Decode(target)
 }
 
-func (app *Application) loadLanguages() {
+func (app *Application) loadLanguages() bool {
 	data, err := os.Open("./html/languages.json")
 	if err != nil {
-		log.Fatalf("Error reading languages: %s", err)
+		log.Printf("Error reading languages: %s", err)
+		return false
 	}
 	defer data.Close()
 
 	app.Languages = make(map[string]string)
-	jsonDecoder(data, &app.Languages)
+	err = jsonDecoder(data, &app.Languages)
+	if err != nil {
+		log.Printf("Error decoding languages: %s", err)
+		return false
+	}
+
+	return true
 }
 
 func (app Application) checkLanguage(language string) bool {

+ 3 - 1
app_test.go

@@ -33,7 +33,9 @@ func TestSetBaseURL(t *testing.T) {
 
 func TestLoadLanguages(t *testing.T) {
 	var app Application
-	app.loadLanguages()
+	if !app.loadLanguages() {
+		t.Fatal("Couldn't load languages!")
+	}
 
 	testLanguageCode := "dan"
 	testLanguage := "Danish"

+ 3 - 1
server.go

@@ -81,7 +81,9 @@ func main() {
 		log.Fatalf("Couldn't log in: %s", err)
 	}
 
-	app.loadLanguages()
+	if !app.loadLanguages() {
+		log.Fatal("Couldn't load languages!")
+	}
 	app.Delay = time.Duration(20 * time.Second)
 
 	hostname := *host + ":" + *port