Skip to content
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.

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

#79 add get interface for polling data #98

Merged
merged 14 commits into from
Mar 20, 2020
Merged

Conversation

GuoYL123
Copy link
Contributor

No description provided.

server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/service/mongo/record/polling_detail_dao.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
@GuoYL123 GuoYL123 force-pushed the master branch 5 times, most recently from ea9ea57 to 56d5d85 Compare March 5, 2020 06:52
@GuoYL123 GuoYL123 force-pushed the master branch 3 times, most recently from add44e9 to 75c336a Compare March 11, 2020 03:31
@GuoYL123 GuoYL123 force-pushed the master branch 2 times, most recently from cb87c6a to fd064a8 Compare March 11, 2020 07:04
# Conflicts:
#	pkg/model/kv.go
#	server/resource/v1/common.go
#	server/resource/v1/history_resource.go
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
@tianxiaoliang
Copy link
Contributor

冲突有空解决

# Conflicts:
#	server/resource/v1/kv_resource.go
#	server/service/mongo/track/polling_detail_dao.go
@GuoYL123 GuoYL123 force-pushed the master branch 2 times, most recently from 12d2d97 to 4f4bbb9 Compare March 16, 2020 03:48
pkg/model/kv.go Outdated Show resolved Hide resolved
server/resource/v1/history_resource.go Outdated Show resolved Hide resolved
# Conflicts:
#	pkg/model/kv.go
#	server/resource/v1/history_resource.go
#	server/resource/v1/history_resource_test.go
}
return nil
resp, _ := ir.Result.(*restful.Response)
err := cb(ir)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不该立刻callback回到前置handler中,应该按顺序执行回去

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

删除了这段代码

return err
}
return nil
resp, _ := ir.Result.(*restful.Response)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是否转换成功需要保留,不成功就执行回到前置handler

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没有response header是不是也要记录,如果这样就无法记录

WriteErrResponse(context, http.StatusNotFound, err.Error(), common.ContentTypeText)
return
}
WriteErrResponse(context, http.StatusInternalServerError, err.Error(), common.ContentTypeText)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

先给你合入,我正在做统一的错误处理规范,现在错误返回都太随意了

@tianxiaoliang tianxiaoliang merged commit c898a7e into apache:master Mar 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants