Merge branch 'master' into jmedved

config/plugin_config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"flag"
+	"github.com/namsral/flag"
 )
 
 // PluginConfig is API for plugins to access configuration.
@@ -23,25 +23,16 @@ type PluginConfig interface {
 //
 // It tries to lookup `plugin + "-config"` in flags.
 func ForPlugin(pluginName string) PluginConfig {
-	plugCfg := pluginName + "-config"
-	flg := flag.CommandLine.Lookup(plugCfg)
-	if flg != nil {
-		val := flg.Value.String()
-		if val != "" {
-			plugCfg = val
-		}
-	}
-
-	return &pluginConfig{configFile: plugCfg}
+	return &pluginConfig{pluginName: pluginName}
 }
 
 type pluginConfig struct {
-	configFile string
+	pluginName string
 }
 
 // GetValue binds the configuration to config method argument
 func (p *pluginConfig) GetValue(config interface{}) (found bool, err error) {
-	err = ParseConfigFromYamlFile(p.configFile, config) //TODO switch to Viper
+	err = ParseConfigFromYamlFile(p.GetConfigName(), config) //TODO switch to Viper
 	if err != nil {
 		return false, err
 	}
@@ -51,5 +42,15 @@ func (p *pluginConfig) GetValue(config interface{}) (found bool, err error) {
 
 // GetConfigName - see description in PluginConfig.GetConfigName
 func (p *pluginConfig) GetConfigName() string {
-	return p.configFile
-}
+	plugCfg := p.pluginName + "-config"
+	flg := flag.CommandLine.Lookup(plugCfg)
+	if flg != nil {
+		val := flg.Value.String()
+
+		if val != "" {
+			plugCfg = val
+		}
+	}
+
+	return plugCfg
+}

db/keyval/etcdv3/plugin_impl_etcdv3.go

@@ -46,6 +46,11 @@ func (p *Plugin) Init() (err error) {
 	// Retrieve config
 	var cfg Config
 	_, err = p.PluginConfig.GetValue(&cfg)
+	// need to be strict about config presence for ETCD
+	//if !found {
+	//	p.Log.Info("etcd config not found ", p.PluginConfig.GetConfigName(), " - skip loading this plugin")
+	//	return nil
+	//}
 	if err != nil {
 		return err
 	}

docs/guidelines/CONFIG.md

@@ -2,7 +2,7 @@
 
 ## Flags & Environment variables
 
-1. Ligato source code uses golang flag package to define & parse command 
+1. Ligato source code uses [flag](github.com/namsral/flag) package to define & parse command 
    line flags and/or environment variables. Plan is to incorporate
    [Viper](https://github.com/spf13/viper)
    that is backward compatible with golang flag package. 

examples/kafka_broker/asyncproducer/asyncproducer.go

@@ -15,7 +15,7 @@
 package main
 
 import (
-	"flag"
+	"github.com/namsral/flag"
 	"fmt"
 	"os"
 

examples/kafka_broker/consumer/consumer.go

@@ -15,7 +15,7 @@
 package main
 
 import (
-	"flag"
+	"github.com/namsral/flag"
 	"fmt"
 	"os"
 	"os/signal"

examples/kafka_broker/syncproducer/syncproducer.go

@@ -15,7 +15,7 @@
 package main
 
 import (
-	"flag"
+	"github.com/namsral/flag"
 	"fmt"
 	"os"
 	"strings"

flavors/etcdkafka/etcd_kafka_flavor.go

@@ -15,7 +15,7 @@
 package etcdkafka
 
 import (
-	"flag"
+	"github.com/namsral/flag"
 
 	"github.com/ligato/cn-infra/core"
 	"github.com/ligato/cn-infra/datasync/kvdbsync"
@@ -24,15 +24,12 @@ import (
 	"github.com/ligato/cn-infra/messaging/kafka"
 )
 
-// flags for location of configuration files
-var (
-	etcdv3DefaultConfig string
-	kafkaDefaultConfig  string
-)
-
+// defines etcd & kafka flags // TODO switch to viper to avoid global configuration
 func init() {
-	flag.StringVar(&etcdv3DefaultConfig, "etcdv3-config", "", "Location of the Etcd configuration file; also set via 'ETCDV3_CONFIG' env variable.")
-	flag.StringVar(&kafkaDefaultConfig, "kafka-config", "", "Location of the Kafka configuration file; also set via 'KAFKA_CONFIG' env variable.")
+	flag.String("etcdv3-config", "etcd.conf",
+		"Location of the Etcd configuration file; also set via 'ETCDV3_CONFIG' env variable.")
+	flag.String("kafka-config", "kafka.conf",
+		"Location of the Kafka configuration file; also set via 'KAFKA_CONFIG' env variable.")
 }
 
 // FlavorEtcdKafka glues together FlavorRPC plugins with:

logging/logrus/log_msg_test.go

@@ -24,31 +24,6 @@ import (
 	"github.com/onsi/gomega"
 )
 
-/*TODO change test to WithField
-func TestEntryWithError(t *testing.T) {
-
-	gomega.RegisterTestingT(t)
-
-	defer func() {
-		ErrorKey = "error"
-	}()
-
-	err := fmt.Errorf("kaboom at layer %d", 4711)
-
-	gomega.Expect(err).To(gomega.BeEquivalentTo(WithError(err).Entry.Data["error"]))
-
-	logger := NewLogger("testLogger")
-	logger.std.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-
-	gomega.Expect(err).To(gomega.BeEquivalentTo(entry.WithError(err).Entry.Data["error"]))
-
-	ErrorKey = "err"
-
-	gomega.Expect(err).To(gomega.BeEquivalentTo(entry.WithError(err).Entry.Data["err"]))
-
-}*/
-
 func TestEntryPanicln(t *testing.T) {
 	gomega.RegisterTestingT(t)
 

logging/logrus/logger.go

@@ -127,9 +127,15 @@ func (logger *Logger) StandardLogger() *lg.Logger {
 func (logger *Logger) GetLineInfo(depth int) string {
 	_, f, l, ok := runtime.Caller(depth)
 	if !ok {
-		f = "???"
-		l = 0
+		return ""
 	}
+	if f == "<autogenerated>" {
+		_, f, l, ok = runtime.Caller(depth + 1)
+		if !ok {
+			return ""
+		}
+	}
+
 	base := path.Base(f)
 	dir := path.Dir(f)
 	folders := strings.Split(dir, "/")
@@ -309,14 +315,14 @@ func (logger *Logger) withFields(fields Fields, depth ...int) *LogMsg {
 	for k, v := range fields {
 		f[k] = v
 	}
-	/*TODO
+
 	if _, ok := f[tagKey]; !ok {
 		f[tagKey] = logger.GetTag()
 	}
 	if _, ok := f[locKey]; !ok {
 		f[locKey] = logger.GetLineInfo(d)
 	}
-	*/
+
 	entry := logger.std.WithFields(f)
 	return &LogMsg{
 		logger: logger,

logging/logrus/logger_test.go

@@ -229,7 +229,6 @@ func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
 	})
 }
 
-/*TODO Lukas
 func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
 
 	var buffer bytes.Buffer
@@ -259,9 +258,8 @@ func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
 	gomega.Expect(fields["msg"]).To(gomega.BeEquivalentTo("omg it is!"))
 	gomega.Expect(fields["context"]).To(gomega.BeEquivalentTo("eating raw fish"))
 	gomega.Expect(fields["fields.msg"]).To(gomega.BeNil(), "should not have prefixed previous `msg` entry")
-}*/
+}
 
-/*TODO*/
 func TestGetSetLevelRace(t *testing.T) {
 	logger := NewLogger("testLogger")
 

messaging/kafka/plugin_impl_kafka.go

@@ -28,7 +28,7 @@ import (
 
 // Plugin provides API for interaction with kafka brokers.
 type Plugin struct {
-	Deps         // inject
+	Deps // inject
 	subscription chan (*client.ConsumerMessage)
 	mx           *mux.Multiplexer
 	consumer     *client.Consumer
@@ -53,7 +53,11 @@ func (p *Plugin) Init() (err error) {
 
 	// Get config data
 	config := &mux.Config{}
-	p.PluginConfig.GetValue(config)
+	found, err := p.PluginConfig.GetValue(config)
+	if !found {
+		p.Log.Info("kafka config not found ", p.PluginConfig.GetConfigName(), " - skip loading this plugin")
+		return nil //skip loading the plugin
+	}
 	if err != nil {
 		return err
 	}