Skip to content

Log grpc write error #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2016
Merged

Log grpc write error #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66dcba6
Log grpc write error
jml Sep 29, 2016
063beae
Delete grpc type & refactor accordingly
jml Sep 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ func writeResponse(w http.ResponseWriter, resp proto.Message) {
// TODO: set Content-type.
}

type grpcSampleAppender struct {
SampleAppender
}

func (g grpcSampleAppender) Write(ctx context.Context, req *remote.WriteRequest) (*remote.WriteResponse, error) {
func getSamples(req *remote.WriteRequest) []*model.Sample {
var samples []*model.Sample
for _, ts := range req.Timeseries {
metric := model.Metric{}
Expand All @@ -98,18 +94,11 @@ func (g grpcSampleAppender) Write(ctx context.Context, req *remote.WriteRequest)
})
}
}

if err := g.Append(ctx, samples); err != nil {
return nil, err
}

return &remote.WriteResponse{}, nil
return samples
}

// AppenderHandler returns a http.Handler that accepts proto encoded samples.
func AppenderHandler(appender SampleAppender) http.Handler {
grpcHandler := grpcSampleAppender{appender}

return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
userID := r.Header.Get(userIDHeaderName)
if userID == "" {
Expand All @@ -132,13 +121,14 @@ func AppenderHandler(appender SampleAppender) http.Handler {
return
}

resp, err := grpcHandler.Write(ctx, &req)
err = appender.Append(ctx, getSamples(&req))
if err != nil {
log.Errorf("append err: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}

respBuf, err := proto.Marshal(resp)
respBuf, err := proto.Marshal(&remote.WriteResponse{})
if err != nil {
log.Errorf("marshall err: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
Expand Down