some bug fixes, some optimizations

This commit is contained in:
simon987
2019-02-11 20:10:33 -05:00
parent 51eb9ae6da
commit 4edf354f8d
13 changed files with 141 additions and 61 deletions

View File

@@ -30,6 +30,11 @@ type GetLogResponse struct {
Logs *[]storage.LogEntry `json:"logs"`
}
type LogResponse struct {
Ok bool `json:"ok"`
Message string `json:"message"`
}
func (e *LogRequest) Time() time.Time {
t := time.Unix(e.TimeStamp, 0)
@@ -89,7 +94,7 @@ func (api *WebAPI) LogTrace(r *Request) {
entry, err := api.parseLogEntry(r)
if err != nil {
r.Json(GetLogResponse{
r.Json(LogResponse{
Ok: false,
Message: "Could not parse request",
}, 400)
@@ -106,7 +111,7 @@ func (api *WebAPI) LogInfo(r *Request) {
entry, err := api.parseLogEntry(r)
if err != nil {
r.Json(GetLogResponse{
r.Json(LogResponse{
Ok: false,
Message: "Could not parse request",
}, 400)
@@ -123,7 +128,7 @@ func (api *WebAPI) LogWarn(r *Request) {
entry, err := api.parseLogEntry(r)
if err != nil {
r.Json(GetLogResponse{
r.Json(LogResponse{
Ok: false,
Message: "Could not parse request",
}, 400)
@@ -140,7 +145,7 @@ func (api *WebAPI) LogError(r *Request) {
entry, err := api.parseLogEntry(r)
if err != nil {
r.Json(GetLogResponse{
r.Json(LogResponse{
Ok: false,
Message: "Could not parse request",
}, 400)

View File

@@ -202,7 +202,15 @@ func (api *WebAPI) ProjectGet(r *Request) {
func (api *WebAPI) ProjectGetAllProjects(r *Request) {
projects := api.Database.GetAllProjects()
worker, _ := api.validateSignature(r)
var id int64
if worker == nil {
id = 0
} else {
id = worker.Id
}
projects := api.Database.GetAllProjects(id)
r.OkJson(GetAllProjectsResponse{
Ok: true,

View File

@@ -156,11 +156,20 @@ func (api *WebAPI) TaskGet(r *Request) {
}
task := api.Database.GetTask(worker)
if task == nil {
r.OkJson(GetTaskResponse{
Ok: true,
Task: task,
})
r.OkJson(GetTaskResponse{
Ok: false,
Message: "No task available",
})
} else {
r.OkJson(GetTaskResponse{
Ok: true,
Task: task,
})
}
}
func (api WebAPI) validateSignature(r *Request) (*storage.Worker, error) {