Browse Source

Don't do fatal with defer

Piotr Czajkowski 3 years ago
parent
commit
16d63333b1
2 changed files with 6 additions and 3 deletions
  1. 2 1
      search.go
  2. 4 2
      tm.go

+ 2 - 1
search.go

@@ -112,7 +112,8 @@ func (app *Application) Search(TMs []TM, text string) SearchResults {
 
 			status, err := app.login()
 			if !status || err != nil {
-				log.Fatalf("Couldn't log in: %s", err)
+				log.Printf("Couldn't log in: %s", err)
+				return finalResults
 			}
 
 			return app.Search(TMs, text)

+ 4 - 2
tm.go

@@ -34,18 +34,20 @@ func (app *Application) GetTMs(language string) []TM {
 
 	resp := GetQuery(queryURL)
 	defer resp.Body.Close()
+
+	var results []TM
 	if resp.StatusCode == 401 {
 		time.Sleep(app.Delay)
 
 		status, err := app.login()
 		if !status || err != nil {
-			log.Fatalf("Couldn't log in: %s", err)
+			log.Printf("Couldn't log in: %s", err)
+			return results
 		}
 
 		return app.GetTMs(language)
 	}
 
-	var results []TM
 	jsonDecoder(resp.Body, &results)
 
 	return results