Skip to content

Format error logs #85

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
kacpersaw merged 5 commits into from
May 13, 2020
Merged

Format error logs #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
418db0a
Format warning logs when loading files
kacpersaw May 12, 2020
6f1cf76
Pretty-print resource error
kacpersaw May 13, 2020
cda9a86
Remove resource error struct
kacpersaw May 13, 2020
1c4d522
Print error if it's not swagger generic error
kacpersaw May 13, 2020
4f2cf3d
Remove unnecessary empty lines
kacpersaw May 13, 2020
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
4 changes: 2 additions & 2 deletions parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ func (p *Parser) loadFilesFromDirectory(entrypoint string) ([]map[string]interfa
// We want to load only supported files, but don't want to stop loading after
// finding unsupported one
if !ok {
log.Warn("unsupported file extension", fileExt)
log.Warn(" unsupported file extension\n", fileExt)
return nil
}
obj, err := fileLoader.LoadFile(path)
if err != nil {
log.Warn(f.Name(), "not loaded due to", err)
log.Warn(f.Name(), " not loaded due to\n", err)
return nil
}
objects = append(objects, obj...)
Expand Down
21 changes: 18 additions & 3 deletions resourcemanager/resourcemanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package resourcemanager
import (
"encoding/json"
"fmt"
swagger "github.com/codilime/floodgate/gateapi"
"os"
"path/filepath"

Expand Down Expand Up @@ -126,7 +127,7 @@ func (rm ResourceManager) syncApplications() error {
for _, application := range rm.resources.Applications {
synced, err := rm.syncResource(application)
if err != nil {
log.Error(err)
rm.printResourceError(err)
return fmt.Errorf("failed to sync application: \"%s\"", application.Name())
}
if !synced {
Expand All @@ -143,7 +144,7 @@ func (rm ResourceManager) syncPipelines() error {
for _, pipeline := range rm.resources.Pipelines {
synced, err := rm.syncResource(pipeline)
if err != nil {
log.Error(err)
rm.printResourceError(err)
return fmt.Errorf("failed to sync pipeline: \"%s\"", pipeline.Name())
}
if !synced {
Expand All @@ -160,7 +161,7 @@ func (rm ResourceManager) syncPipelineTemplates() error {
for _, pipelineTemplate := range rm.resources.PipelineTemplates {
synced, err := rm.syncResource(pipelineTemplate)
if err != nil {
log.Error(err)
rm.printResourceError(err)
return fmt.Errorf("failed to sync pipeline template: \"%s\"", pipelineTemplate.Name())
}
if !synced {
Expand Down Expand Up @@ -260,3 +261,17 @@ func (rm ResourceManager) saveResourceData(filePath string, resourceData []byte)
}
return nil
}

func (rm ResourceManager) printResourceError(err error) {
if swaggerError, ok := err.(swagger.GenericSwaggerError); ok {
var resErr map[string]interface{}
err = json.Unmarshal(swaggerError.Body(), &resErr)
if err != nil {
log.Errorf("%v", err)
}

log.Errorf("Status: %v, Error: %s, Message: %s", resErr["status"], resErr["error"], resErr["message"])
} else {
log.Errorf("%v", err)
}
}