Skip to content

Commit

Permalink
fix: error level for err logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@nick-bisonai
nick-bisonai committed Feb 24, 2024
1 parent ee2315b commit c317e92
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 38 deletions.
24 changes: 12 additions & 12 deletions node/pkg/admin/tests/test_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ func req[T any](app *fiber.App, method string, endpoint string, requestBody inte

resultBody, err := rawReq(app, method, endpoint, requestBody)
if err != nil {
log.Info().Err(err).Msg("failed to raw request")
log.Error().Err(err).Msg("failed to raw request")
return result, err
}

err = json.Unmarshal(resultBody, &result)
if err != nil {
log.Info().Err(err).Msg("failed Unmarshal result body:" + string(resultBody))
log.Error().Err(err).Msg("failed Unmarshal result body:" + string(resultBody))
return result, err
}

Expand All @@ -37,7 +37,7 @@ func rawReq(app *fiber.App, method string, endpoint string, requestBody interfac
if requestBody != nil {
marshalledData, err := json.Marshal(requestBody)
if err != nil {
log.Info().Err(err).Msg("failed to marshal request body")
log.Error().Err(err).Msg("failed to marshal request body")
return result, err
}
body = bytes.NewReader(marshalledData)
Expand All @@ -51,18 +51,18 @@ func rawReq(app *fiber.App, method string, endpoint string, requestBody interfac

req.Header.Set("Content-Type", "application/json")
if err != nil {
log.Info().Err(err).Msg("failed to create request")
log.Error().Err(err).Msg("failed to create request")
return result, err
}
res, err := app.Test(req, -1)
if err != nil {
log.Info().Err(err).Msg("failed to call test")
log.Error().Err(err).Msg("failed to call test")
return result, err
}

resultBody, err := io.ReadAll(res.Body)
if err != nil {
log.Info().Err(err).Str("resultBody", string(resultBody)).Msg("failed to read response body")
log.Error().Err(err).Str("resultBody", string(resultBody)).Msg("failed to read response body")
return result, err
}

Expand Down Expand Up @@ -96,15 +96,15 @@ func UrlRequest[T any](urlEndpoint string, method string, requestBody interface{
if requestBody != nil {
marshalledData, err := json.Marshal(requestBody)
if err != nil {
log.Info().Err(err).Msg("failed to marshal request body")
log.Error().Err(err).Msg("failed to marshal request body")
return result, err
}
body = bytes.NewReader(marshalledData)
}

url, err := url.Parse(urlEndpoint)
if err != nil {
log.Info().Err(err).Msg("failed to parse url")
log.Error().Err(err).Msg("failed to parse url")
return result, err
}

Expand All @@ -116,24 +116,24 @@ func UrlRequest[T any](urlEndpoint string, method string, requestBody interface{

req.Header.Set("Content-Type", "application/json")
if err != nil {
log.Info().Err(err).Msg("failed to create request")
log.Error().Err(err).Msg("failed to create request")
return result, err
}

response, err := http.DefaultClient.Do(req)
if err != nil {
log.Info().Err(err).Str("url", url.String()).Msg("failed to make request")
log.Error().Err(err).Str("url", url.String()).Msg("failed to make request")
return result, err
}
resultBody, err := io.ReadAll(response.Body)
if err != nil {
log.Info().Err(err).Msg("failed to read response body")
log.Error().Err(err).Msg("failed to read response body")
return result, err
}

err = json.Unmarshal(resultBody, &result)
if err != nil {
log.Info().Err(err).Str("resultBody", string(resultBody)).Msg("failed Unmarshal result body")
log.Error().Err(err).Str("resultBody", string(resultBody)).Msg("failed Unmarshal result body")

return result, err
}
Expand Down
9 changes: 4 additions & 5 deletions node/pkg/fetcher/fetcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (f *Fetcher) runAdapter(ctx context.Context, adapter AdapterDetail) {
for range ticker.C {
err := f.fetchAndInsert(ctx, adapter)
if err != nil {
log.Info().Err(err).Msg("failed to fetch and insert")
log.Error().Err(err).Msg("failed to fetch and insert")
}
}
}
Expand Down Expand Up @@ -93,19 +93,18 @@ func (f *Fetcher) fetch(adapter AdapterDetail) ([]float64, error) {
definition := new(Definition)
err := json.Unmarshal(feed.Definition, &definition)
if err != nil {
log.Info().Err(err).Msg("failed to unmarshal feed definition")
log.Error().Err(err).Msg("failed to unmarshal feed definition")
continue
}
res, err := utils.GetRequest[interface{}](definition.Url, nil, definition.Headers)
if err != nil {
log.Info().Err(err).Msg("failed to get request")

log.Error().Err(err).Msg("failed to get request")
continue
}

result, err := utils.Reduce(res, definition.Reducers)
if err != nil {
log.Info().Err(err).Msg("failed to reduce")
log.Error().Err(err).Msg("failed to reduce")
continue
}

Expand Down
2 changes: 1 addition & 1 deletion node/pkg/libp2p/libp2p.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func MakePubsub(ctx context.Context, host host.Host) (*pubsub.PubSub, error) {
func GetHostAddress(host host.Host) (string, error) {
hostAddr, err := multiaddr.NewMultiaddr(fmt.Sprintf("/p2p/%s", host.ID()))
if err != nil {
log.Info().Err(err).Msg("Error creating multiaddr")
log.Error().Err(err).Msg("Error creating multiaddr")
return "", err
}

Expand Down
30 changes: 15 additions & 15 deletions node/pkg/raft/raft.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (r *Raft) Run(ctx context.Context, node Node) {
if node.GetJobTimeout() != nil {
err := node.SetJobTicker(node.GetJobTimeout())
if err != nil {
log.Info().Err(err).Msg("failed to set job ticker")
log.Error().Err(err).Msg("failed to set job ticker")
}
jobTicker = node.GetJobTicker().C
}
Expand All @@ -54,7 +54,7 @@ func (r *Raft) Run(ctx context.Context, node Node) {
case msg := <-r.MessageBuffer:
err := r.handleMessage(node, msg)
if err != nil {
log.Info().Err(err).Msg("failed to handle message")
log.Error().Err(err).Msg("failed to handle message")
}

case <-r.ElectionTimer.C:
Expand All @@ -63,7 +63,7 @@ func (r *Raft) Run(ctx context.Context, node Node) {
case <-jobTicker:
err := node.Job()
if err != nil {
log.Info().Err(err).Msg("failed to execute job")
log.Error().Err(err).Msg("failed to execute job")
}
}
}
Expand All @@ -72,16 +72,16 @@ func (r *Raft) Run(ctx context.Context, node Node) {
func (r *Raft) subscribe(ctx context.Context) {
sub, err := r.Topic.Subscribe()
if err != nil {
log.Info().Err(err).Msg("failed to subscribe to topic")
log.Error().Err(err).Msg("failed to subscribe to topic")
}
for {
rawMsg, err := sub.Next(ctx)
if err != nil {
log.Info().Err(err).Msg("failed to get message from topic")
log.Error().Err(err).Msg("failed to get message from topic")
}
msg, err := r.unmarshalMessage(rawMsg.Data)
if err != nil {
log.Info().Err(err).Msg("failed to unmarshal message")
log.Error().Err(err).Msg("failed to unmarshal message")
}
r.MessageBuffer <- msg
}
Expand Down Expand Up @@ -152,7 +152,7 @@ func (r *Raft) handleRequestVote(msg Message) error {
var RequestVoteMessage RequestVoteMessage
err := json.Unmarshal(msg.Data, &RequestVoteMessage)
if err != nil {
log.Info().Err(err).Msg("failed to unmarshal request vote message")
log.Error().Err(err).Msg("failed to unmarshal request vote message")
return err
}

Expand All @@ -163,7 +163,7 @@ func (r *Raft) handleRequestVote(msg Message) error {
if RequestVoteMessage.Term < r.GetCurrentTerm() {
err := r.sendReplyVote(msg.SentFrom, false)
if err != nil {
log.Info().Err(err).Msg("failed to send reply vote")
log.Error().Err(err).Msg("failed to send reply vote")
}
return nil
}
Expand Down Expand Up @@ -221,7 +221,7 @@ func (r *Raft) sendHeartbeat() error {
}
marshalledHeartbeatMsg, err := json.Marshal(_heartbeatMessage)
if err != nil {
log.Info().Err(err).Msg("failed to marshal heartbeat message")
log.Error().Err(err).Msg("failed to marshal heartbeat message")
return err
}

Expand All @@ -232,7 +232,7 @@ func (r *Raft) sendHeartbeat() error {
}
err = r.PublishMessage(heartbeatMessage)
if err != nil {
log.Info().Err(err).Msg("failed to send heartbeat")
log.Error().Err(err).Msg("failed to send heartbeat")
return err
}
return nil
Expand Down Expand Up @@ -293,7 +293,7 @@ func (r *Raft) StopHeartbeatTicker(node Node) {
node.GetLeaderJobTicker().Stop()
err := node.SetLeaderJobTicker(nil)
if err != nil {
log.Info().Err(err).Msg("failed to stop leader job ticker")
log.Error().Err(err).Msg("failed to stop leader job ticker")
}
}
if r.Resign != nil {
Expand All @@ -314,7 +314,7 @@ func (r *Raft) becomeLeader(node Node) {
if node.GetLeaderJobTimeout() != nil {
err := node.SetLeaderJobTicker(node.GetLeaderJobTimeout())
if err != nil {
log.Info().Err(err).Msg("failed to set leader job ticker")
log.Error().Err(err).Msg("failed to set leader job ticker")
}
leaderJobTicker = node.GetLeaderJobTicker().C
}
Expand All @@ -325,12 +325,12 @@ func (r *Raft) becomeLeader(node Node) {
case <-r.HeartbeatTicker.C:
err := r.sendHeartbeat()
if err != nil {
log.Info().Err(err).Msg("failed to send heartbeat")
log.Error().Err(err).Msg("failed to send heartbeat")
}
case <-leaderJobTicker:
err := node.LeaderJob()
if err != nil {
log.Info().Err(err).Msg("failed to execute leader job")
log.Error().Err(err).Msg("failed to execute leader job")
}
case <-r.Resign:
log.Debug().Msg("resigning as leader")
Expand Down Expand Up @@ -364,7 +364,7 @@ func (r *Raft) startElection() {

err := r.sendRequestVote()
if err != nil {
log.Info().Err(err).Msg("failed to send request vote")
log.Error().Err(err).Msg("failed to send request vote")
}
}

Expand Down
10 changes: 5 additions & 5 deletions node/pkg/utils/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ func UrlRequestRaw(urlEndpoint string, method string, requestBody interface{}, h
if requestBody != nil {
marshalledData, err := json.Marshal(requestBody)
if err != nil {
log.Info().Err(err).Msg("failed to marshal request body")
log.Error().Err(err).Msg("failed to marshal request body")
return nil, err
}
body = bytes.NewReader(marshalledData)
}

url, err := url.Parse(urlEndpoint)
if err != nil {
log.Info().Err(err).Msg("failed to parse url")
log.Error().Err(err).Msg("failed to parse url")
return nil, err
}

Expand All @@ -44,7 +44,7 @@ func UrlRequestRaw(urlEndpoint string, method string, requestBody interface{}, h
body,
)
if err != nil {
log.Info().Err(err).Msg("failed to create request")
log.Error().Err(err).Msg("failed to create request")
return nil, err
}

Expand All @@ -66,7 +66,7 @@ func UrlRequest[T any](urlEndpoint string, method string, requestBody interface{
var result T
response, err := UrlRequestRaw(urlEndpoint, method, requestBody, headers)
if err != nil {
log.Info().Err(err).Msg("failed to make request")
log.Error().Err(err).Msg("failed to make request")
return result, err
}

Expand All @@ -80,7 +80,7 @@ func UrlRequest[T any](urlEndpoint string, method string, requestBody interface{

resultBody, err := io.ReadAll(response.Body)
if err != nil {
log.Info().Err(err).Msg("failed to read response body")
log.Error().Err(err).Msg("failed to read response body")
return result, err
}

Expand Down

0 comments on commit c317e92

Please sign in to comment.