handle unchecked errors

This commit is contained in:
Philipp Mieden 2019-05-21 10:12:05 +02:00
parent 54ee995295
commit 5ee042bcd4
4 changed files with 46 additions and 20 deletions

View File

@ -43,21 +43,28 @@ func getAvailableAddr() string {
return "127.0.0.1:" + strconv.Itoa(getFreePort()) return "127.0.0.1:" + strconv.Itoa(getFreePort())
} }
var testServerSocketAddr string var (
var testServerWebserverAddr string testServerSocketAddr string
testServerWebserverAddr string
)
func initTestServer(t testing.TB) (socketAddr, webserverAddr string) { func initTestServer(t testing.TB) (socketAddr, webserverAddr string) {
socketAddr = getAvailableAddr() socketAddr = getAvailableAddr()
webserverAddr = getAvailableAddr() webserverAddr = getAvailableAddr()
testServer, varDir := mock.GetMockData(t) testServer, varDir := mock.GetMockData(t)
log.SelectedLevel = log.LevelError log.SelectedLevel = log.LevelError
go server.RunServerSocketAndWebServer( go func() {
err := server.RunServerSocketAndWebServer(
testServer.URL+"/repo-two-dimensions.json", testServer.URL+"/repo-two-dimensions.json",
socketAddr, socketAddr,
webserverAddr, webserverAddr,
pathContentserver, pathContentserver,
varDir, varDir,
) )
if err != nil {
t.Fatal("test server crashed: ", err)
}
}()
socketClient, errClient := NewClient(socketAddr, 1, time.Duration(time.Millisecond*100)) socketClient, errClient := NewClient(socketAddr, 1, time.Duration(time.Millisecond*100))
if errClient != nil { if errClient != nil {
panic(errClient) panic(errClient)

View File

@ -22,7 +22,10 @@ func TestHistoryCurrent(t *testing.T) {
h = testHistory() h = testHistory()
test = []byte("test") test = []byte("test")
) )
h.add(test) err := h.add(test)
if err != nil {
t.Fatal("failed to add: ", err)
}
current, err := h.getCurrent() current, err := h.getCurrent()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -35,10 +38,16 @@ func TestHistoryCurrent(t *testing.T) {
func TestHistoryCleanup(t *testing.T) { func TestHistoryCleanup(t *testing.T) {
h := testHistory() h := testHistory()
for i := 0; i < 50; i++ { for i := 0; i < 50; i++ {
h.add([]byte(fmt.Sprint(i))) err := h.add([]byte(fmt.Sprint(i)))
if err != nil {
t.Fatal("failed to add: ", err)
}
time.Sleep(time.Millisecond * 5) time.Sleep(time.Millisecond * 5)
} }
h.cleanup() err := h.cleanup()
if err != nil {
t.Fatal("failed to run cleanup: ", err)
}
files, err := h.getHistory() files, err := h.getHistory()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

View File

@ -5,6 +5,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/foomo/contentserver/log"
"github.com/foomo/contentserver/status" "github.com/foomo/contentserver/status"
"github.com/foomo/contentserver/repo" "github.com/foomo/contentserver/repo"
@ -42,5 +43,8 @@ func (s *webServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
http.Error(w, errReply.Error(), http.StatusInternalServerError) http.Error(w, errReply.Error(), http.StatusInternalServerError)
return return
} }
w.Write(reply) _, err := w.Write(reply)
if err != nil {
log.Error("failed to write webServer reply: ", err)
}
} }

View File

@ -3,8 +3,9 @@ package status
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/foomo/contentserver/log"
"net/http" "net/http"
"github.com/foomo/contentserver/log"
) )
func RunHealthzHandlerListener(address string, serviceName string) { func RunHealthzHandlerListener(address string, serviceName string) {
@ -13,13 +14,18 @@ func RunHealthzHandlerListener(address string, serviceName string) {
} }
func HealthzHandler(serviceName string) http.Handler { func HealthzHandler(serviceName string) http.Handler {
data := map[string]string{ var (
data = map[string]string{
"service": serviceName, "service": serviceName,
} }
status, _ := json.Marshal(data) status, _ = json.Marshal(data)
h := http.NewServeMux() h = http.NewServeMux()
)
h.Handle("/healthz", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { h.Handle("/healthz", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
w.Write(status) _, err := w.Write(status)
if err != nil {
log.Error("failed to write healthz status: ", err)
}
})) }))
return h return h