增加转换日志配置的方法，使用默认Channel

Author: reggiepy

cmd/LogBeetle/sub/root.go

@@ -6,6 +6,7 @@ import (
 	"github.com/reggiepy/LogBeetle/pkg/config"
 	"github.com/reggiepy/LogBeetle/pkg/consumer/logconsumer"
 	"github.com/reggiepy/LogBeetle/pkg/consumer/nsqconsumer"
+	"github.com/reggiepy/LogBeetle/pkg/convert"
 	"github.com/reggiepy/LogBeetle/pkg/logger"
 	"github.com/reggiepy/LogBeetle/pkg/producer/nsqproducer"
 	"github.com/reggiepy/LogBeetle/pkg/worker"
@@ -58,7 +59,8 @@ var rootCmd = cobra.Command{
 	Version: "",
 	Run: func(cmd *cobra.Command, args []string) {
 		_ = config.ShowConfig("simple")
-		err := logger.InitLogger(config.Instance)
+		loggerConfig, err := convert.ConfigToLoggerConfig(config.Instance)
+		err = logger.InitLogger(*loggerConfig)
 		if err != nil {
 			fmt.Println(err.Error())
 			os.Exit(1)
@@ -183,7 +185,6 @@ func serverStart() {
 							Address:    nsqConfig.NSQDAddress,
 							AuthSecret: nsqConfig.AuthSecret,
 							Topic:      "test",
-							Channel:    "test_channel",
 						}, "test.log"),
 				)
 
@@ -196,7 +197,6 @@ func serverStart() {
 								Address:    nsqConfig.NSQDAddress,
 								AuthSecret: nsqConfig.AuthSecret,
 								Topic:      consumerConfig.Topic,
-								Channel:    consumerConfig.Channel,
 							}, consumerConfig.FileName),
 					)
 				}

log-beetle.tmp.yaml

@@ -14,7 +14,6 @@ ConsumerConfig:
   Consumers:
     - Name: "test"
       Topic: "test"
-      Channel: "test"
       FileName: "test.log"
 
 NSQConfig:

pkg/config/config.go

@@ -13,7 +13,6 @@ var Instance *Config
 type Consumer struct {
 	Name     string `yaml:"Name"`
 	Topic    string `yaml:"Topic"`
-	Channel  string `yaml:"Channel"`
 	FileName string `yaml:"FileName"`
 }
 

pkg/consumer/nsqconsumer/consumer.go

@@ -7,7 +7,6 @@ import (
 
 type NsqConsumerConfig struct {
 	Topic      string
-	Channel    string
 	Address    string
 	AuthSecret string
 	Handler    *MessageHandler
@@ -20,7 +19,7 @@ func NewNsqConsumer(config NsqConsumerConfig) *nsq.Consumer {
 			log.Fatalf("Failed to set auth_secret: %v", err)
 		}
 	}
-	consumer, err := nsq.NewConsumer(config.Topic, config.Channel, cfg)
+	consumer, err := nsq.NewConsumer(config.Topic, "consumer", cfg)
 	if err != nil {
 		log.Fatalf("Failed to create NSQ Consumer: %v", err)
 	}

pkg/convert/logger.go

@@ -0,0 +1,17 @@
+package convert
+
+import (
+	"encoding/json"
+	"github.com/reggiepy/LogBeetle/pkg/config"
+	"github.com/reggiepy/LogBeetle/pkg/logger"
+)
+
+func ConfigToLoggerConfig(config *config.Config) (*logger.Config, error) {
+	var ret = &logger.Config{}
+	jsonBytes, _ := json.Marshal(config.LogConfig)
+	err := json.Unmarshal(jsonBytes, ret)
+	if err != nil {
+		return nil, err
+	}
+	return ret, nil
+}