apis: unify http response format

Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-06-24 15:07:11 +08:00
parent 5910ef4554
commit 87bdbfaaf2
4 changed files with 74 additions and 3 deletions

View File

@@ -30,31 +30,63 @@ import (
func LoggingQueryCluster(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelCluster, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
func LoggingQueryWorkspace(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelWorkspace, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
func LoggingQueryNamespace(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelNamespace, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
func LoggingQueryWorkload(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelWorkload, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
func LoggingQueryPod(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelPod, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
func LoggingQueryContainer(request *restful.Request, response *restful.Response) {
res := logQuery(log.QueryLevelContainer, request)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
@@ -81,6 +113,10 @@ func LoggingUpdateFluentbitFilters(request *restful.Request, response *restful.R
func LoggingQueryFluentbitOutputs(request *restful.Request, response *restful.Response) {
res := log.FluentbitOutputsQuery()
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
@@ -97,6 +133,11 @@ func LoggingInsertFluentbitOutput(request *restful.Request, response *restful.Re
res = log.FluentbitOutputInsert(output)
}
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
@@ -115,6 +156,12 @@ func LoggingUpdateFluentbitOutput(request *restful.Request, response *restful.Re
}
res := log.FluentbitOutputUpdate(output, id)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}
@@ -125,6 +172,11 @@ func LoggingDeleteFluentbitOutput(request *restful.Request, response *restful.Re
id := request.PathParameter("output")
res = log.FluentbitOutputDelete(id)
if res.Status != http.StatusOK {
response.WriteHeaderAndEntity(res.Status, res.Error)
return
}
response.WriteAsJson(res)
}