mirror of
https://github.com/foomo/contentserver.git
synced 2025-10-16 12:25:44 +00:00
fix: log
This commit is contained in:
parent
b4b9de6df3
commit
a53de5827c
@ -17,6 +17,7 @@ import (
|
|||||||
|
|
||||||
func TestUpdate(t *testing.T) {
|
func TestUpdate(t *testing.T) {
|
||||||
testWithClients(t, func(t *testing.T, c *client.Client) {
|
testWithClients(t, func(t *testing.T, c *client.Client) {
|
||||||
|
t.Helper()
|
||||||
response, err := c.Update(t.Context())
|
response, err := c.Update(t.Context())
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.True(t, response.Success, "update has to return .Sucesss true")
|
require.True(t, response.Success, "update has to return .Sucesss true")
|
||||||
@ -27,6 +28,7 @@ func TestUpdate(t *testing.T) {
|
|||||||
|
|
||||||
func TestGetURIs(t *testing.T) {
|
func TestGetURIs(t *testing.T) {
|
||||||
testWithClients(t, func(t *testing.T, c *client.Client) {
|
testWithClients(t, func(t *testing.T, c *client.Client) {
|
||||||
|
t.Helper()
|
||||||
request := mock.MakeValidURIsRequest()
|
request := mock.MakeValidURIsRequest()
|
||||||
uriMap, err := c.GetURIs(t.Context(), request.Dimension, request.IDs)
|
uriMap, err := c.GetURIs(t.Context(), request.Dimension, request.IDs)
|
||||||
time.Sleep(100 * time.Millisecond)
|
time.Sleep(100 * time.Millisecond)
|
||||||
@ -37,6 +39,7 @@ func TestGetURIs(t *testing.T) {
|
|||||||
|
|
||||||
func TestGetRepo(t *testing.T) {
|
func TestGetRepo(t *testing.T) {
|
||||||
testWithClients(t, func(t *testing.T, c *client.Client) {
|
testWithClients(t, func(t *testing.T, c *client.Client) {
|
||||||
|
t.Helper()
|
||||||
r, err := c.GetRepo(t.Context())
|
r, err := c.GetRepo(t.Context())
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
if assert.NotEmpty(t, r, "received empty JSON from GetRepo") {
|
if assert.NotEmpty(t, r, "received empty JSON from GetRepo") {
|
||||||
@ -47,6 +50,7 @@ func TestGetRepo(t *testing.T) {
|
|||||||
|
|
||||||
func TestGetNodes(t *testing.T) {
|
func TestGetNodes(t *testing.T) {
|
||||||
testWithClients(t, func(t *testing.T, c *client.Client) {
|
testWithClients(t, func(t *testing.T, c *client.Client) {
|
||||||
|
t.Helper()
|
||||||
nodesRequest := mock.MakeNodesRequest()
|
nodesRequest := mock.MakeNodesRequest()
|
||||||
nodes, err := c.GetNodes(t.Context(), nodesRequest.Env, nodesRequest.Nodes)
|
nodes, err := c.GetNodes(t.Context(), nodesRequest.Env, nodesRequest.Nodes)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@ -66,6 +70,7 @@ func TestGetNodes(t *testing.T) {
|
|||||||
|
|
||||||
func TestGetContent(t *testing.T) {
|
func TestGetContent(t *testing.T) {
|
||||||
testWithClients(t, func(t *testing.T, c *client.Client) {
|
testWithClients(t, func(t *testing.T, c *client.Client) {
|
||||||
|
t.Helper()
|
||||||
request := mock.MakeValidContentRequest()
|
request := mock.MakeValidContentRequest()
|
||||||
response, err := c.GetContent(t.Context(), request)
|
response, err := c.GetContent(t.Context(), request)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@ -119,10 +124,10 @@ func testWithClients(t *testing.T, testFunc func(t *testing.T, c *client.Client)
|
|||||||
httpClient := newHTTPClient(t, httpRepoServer)
|
httpClient := newHTTPClient(t, httpRepoServer)
|
||||||
socketClient := newSocketClient(t, socketRepoServer.Addr().String())
|
socketClient := newSocketClient(t, socketRepoServer.Addr().String())
|
||||||
defer func() {
|
defer func() {
|
||||||
httpRepoServer.Close()
|
|
||||||
socketRepoServer.Close()
|
|
||||||
httpClient.Close()
|
httpClient.Close()
|
||||||
socketClient.Close()
|
socketClient.Close()
|
||||||
|
httpRepoServer.Close()
|
||||||
|
socketRepoServer.Close()
|
||||||
}()
|
}()
|
||||||
testFunc(t, httpClient)
|
testFunc(t, httpClient)
|
||||||
testFunc(t, socketClient)
|
testFunc(t, socketClient)
|
||||||
|
|||||||
@ -67,7 +67,7 @@ func (h *Socket) Serve(conn net.Conn) {
|
|||||||
// let us read with 1 byte steps on conn until we find "{"
|
// let us read with 1 byte steps on conn until we find "{"
|
||||||
_, readErr := conn.Read(headerBuffer[0:])
|
_, readErr := conn.Read(headerBuffer[0:])
|
||||||
if readErr != nil {
|
if readErr != nil {
|
||||||
h.l.Debug("looks like the client closed the connection", zap.Error(readErr))
|
// h.l.Debug("looks like the client closed the connection", zap.Error(readErr))
|
||||||
metrics.NumSocketsGauge.WithLabelValues(conn.RemoteAddr().String()).Dec()
|
metrics.NumSocketsGauge.WithLabelValues(conn.RemoteAddr().String()).Dec()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user