chore(backend): refactor error checks

This commit is contained in:
Łukasz Mierzwa
2020-11-21 18:14:46 +00:00
committed by Łukasz Mierzwa
parent 5d1e061604
commit c4a3478d1f
2 changed files with 5 additions and 3 deletions
+3 -2
View File
@@ -3,6 +3,7 @@ package main
import (
"compress/flate"
"context"
"errors"
"fmt"
"html/template"
"io/ioutil"
@@ -451,7 +452,7 @@ func serve(errorHandling pflag.ErrorHandling) error {
log.Info().Str("address", listener.Addr().String()).Msg("Starting HTTPS server")
go func() {
err := httpServer.ServeTLS(listener, config.Config.Listen.TLS.Cert, config.Config.Listen.TLS.Key)
if err != nil && err != http.ErrServerClosed {
if !errors.Is(err, http.ErrServerClosed) {
log.Error().Err(err).Msg("HTTPS server startup error")
quit <- syscall.SIGTERM
}
@@ -460,7 +461,7 @@ func serve(errorHandling pflag.ErrorHandling) error {
log.Info().Str("address", listener.Addr().String()).Msg("Starting HTTP server")
go func() {
err := httpServer.Serve(listener)
if err != nil && err != http.ErrServerClosed {
if !errors.Is(err, http.ErrServerClosed) {
log.Error().Err(err).Msg("HTTP server startup error")
quit <- syscall.SIGTERM
}
+2 -1
View File
@@ -5,6 +5,7 @@ import (
"compress/gzip"
"crypto/tls"
"crypto/x509"
"errors"
"io"
"net/http"
"net/http/httptest"
@@ -99,7 +100,7 @@ func readAll(source io.ReadCloser) (int64, error) {
got, err := source.Read(b)
readSize += int64(got)
if err != nil {
if err == io.EOF {
if errors.Is(err, io.EOF) {
return readSize, nil
}
return readSize, err