Change to weave common logging

This commit is contained in:
Bryan Boreham committed 2016-12-07 11:53:31 +00:00
1 parent 8530528dd5
commit 6a04c6c7bd
5 files changed
+31 -42

No files matched your search

+10 -22
View File
@@ -5,7 +5,6 @@ import (
"os/signal"
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/coreos/go-iptables/iptables"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
@@ -17,6 +16,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"
"github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/npc"
"github.com/weaveworks/weave/npc/ipset"
"github.com/weaveworks/weave/npc/metrics"
@@ -28,11 +28,7 @@ var (
metricsAddr string
)
func handleError(err error) {
if err != nil {
log.Fatal(err)
}
}
func handleError(err error) { common.CheckFatal(err) }
func makeController(getter cache.Getter, resource string,
objType runtime.Object, handlers cache.ResourceEventHandlerFuncs) *cache.Controller {
@@ -89,30 +85,24 @@ func resetIPSets(ips ipset.Interface) error {
}
func root(cmd *cobra.Command, args []string) {
log.Infof("Starting Weaveworks NPC %s", version)
common.Log.Infof("Starting Weaveworks NPC %s", version)
if err := metrics.Start(metricsAddr); err != nil {
log.Fatalf("Failed to start metrics: %v", err)
common.Log.Fatalf("Failed to start metrics: %v", err)
}
if err := ulogd.Start(); err != nil {
log.Fatalf("Failed to start ulogd: %v", err)
common.Log.Fatalf("Failed to start ulogd: %v", err)
}
config, err := rest.InClusterConfig()
if err != nil {
log.Fatal(err)
}
handleError(err)
client, err := kubernetes.NewForConfig(config)
if err != nil {
log.Fatal(err)
}
handleError(err)
ipt, err := iptables.New()
if err != nil {
log.Fatal(err)
}
handleError(err)
ips := ipset.New()
@@ -163,7 +153,7 @@ func root(cmd *cobra.Command, args []string) {
signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
log.Fatalf("Exiting: %v", <-signals)
common.Log.Fatalf("Exiting: %v", <-signals)
}
func main() {
@@ -174,7 +164,5 @@ func main() {
rootCmd.PersistentFlags().StringVar(&metricsAddr, "metrics-addr", ":6781", "metrics server bind address")
if err := rootCmd.Execute(); err != nil {
log.Fatal(err)
}
handleError(rootCmd.Execute())
}