LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up logrus

Browse Source 
Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
This commit is contained in:
Charlie Drage
2017-02-27 10:53:24 -05:00
parent 135165b39c
commit c0043ebd11
9 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/loader/bundle/bundle.go
+7 -7
View File
@@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/fatih/structs"
"github.com/kubernetes-incubator/kompose/pkg/kobject"
)
@@ -182,17 +182,17 @@ func (b *Bundle) LoadFile(files []string) kobject.KomposeObject {
file := files[0]
buf, err := ioutil.ReadFile(file)
if err != nil {
logrus.Fatalf("Failed to read bundles file: %s ", err)
log.Fatalf("Failed to read bundles file: %s ", err)
}
reader := strings.NewReader(string(buf))
bundle, err := loadFile(reader)
if err != nil {
logrus.Fatalf("Failed to parse bundles file: %s", err)
log.Fatalf("Failed to parse bundles file: %s", err)
}
noSupKeys := checkUnsupportedKey(bundle)
for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName)
log.Warningf("Unsupported %s key - ignoring", keyName)
}
for name, service := range bundle.Services {
@@ -205,19 +205,19 @@ func (b *Bundle) LoadFile(files []string) kobject.KomposeObject {
image, err := loadImage(service)
if err != "" {
logrus.Fatalf("Failed to load image from bundles file: " + err)
log.Fatalf("Failed to load image from bundles file: " + err)
}
serviceConfig.Image = image
envs, err := loadEnvVars(service)
if err != "" {
logrus.Fatalf("Failed to load envvar from bundles file: " + err)
log.Fatalf("Failed to load envvar from bundles file: " + err)
}
serviceConfig.Environment = envs
ports, err := loadPorts(service)
if err != "" {
logrus.Fatalf("Failed to load ports from bundles file: " + err)
log.Fatalf("Failed to load ports from bundles file: " + err)
}
serviceConfig.Port = ports
pkg/loader/compose/compose.go
+6 -6
View File
@@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"github.com/Sirupsen/logrus"
log "github.com/Sirupsen/logrus"
"github.com/docker/libcompose/config"
"github.com/docker/libcompose/lookup"
"github.com/docker/libcompose/project"
@@ -86,7 +86,7 @@ func checkUnsupportedKey(composeProject *project.Project) []string {
// Check to see if the default network is available and length is only equal to one.
// Else, warn the user that root level networks are not supported (yet)
if _, ok := composeProject.NetworkConfigs["default"]; ok && len(composeProject.NetworkConfigs) == 1 {
logrus.Debug("Default network found")
log.Debug("Default network found")
} else if len(composeProject.NetworkConfigs) > 0 {
keysFound = append(keysFound, "root level networks")
}
@@ -303,12 +303,12 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
composeObject := project.NewProject(context, nil, nil)
err := composeObject.Parse()
if err != nil {
logrus.Fatalf("Failed to load compose file: %v", err)
log.Fatalf("Failed to load compose file: %v", err)
}
noSupKeys := checkUnsupportedKey(composeObject)
for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName)
log.Warningf("Unsupported %s key - ignoring", keyName)
}
for name, composeServiceConfig := range composeObject.ServiceConfigs.All() {
@@ -326,7 +326,7 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
// load ports
ports, err := loadPorts(composeServiceConfig.Ports)
if err != nil {
logrus.Fatalf("%q failed to load ports from compose file: %v", name, err)
log.Fatalf("%q failed to load ports from compose file: %v", name, err)
}
serviceConfig.Port = ports
@@ -382,7 +382,7 @@ func handleServiceType(ServiceType string) string {
case "loadbalancer":
return string(api.ServiceTypeLoadBalancer)
default:
logrus.Fatalf("Unknown value '%s', supported values are 'NodePort, ClusterIP or LoadBalancer'", ServiceType)
log.Fatalf("Unknown value '%s', supported values are 'NodePort, ClusterIP or LoadBalancer'", ServiceType)
return ""
}
}