resolved conflicts commit

main.go

@@ -7,10 +7,9 @@ import (
 	"com.navi.medici.janus/schema"
 	"com.navi.medici.janus/server"
 	"com.navi.medici.janus/utils"
+	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"log"
-
-	"github.com/spf13/viper"
 )
 
 var (
@@ -19,7 +18,7 @@ var (
 	logger *zap.Logger
 )
 
-const metrics_port = "4000"
+const METRICS_PORT = "4000"
 
 func init() {
 	configs := getConfigs()
@@ -27,15 +26,10 @@ func init() {
 	logger = utils.GetLogger()
 	port = configs.Server.Port
 	logger.Debug("PORT IS: " + port)
-	logger.Debug(configs.Kafka.Bootstrap_Servers)
-	logger.Debug(configs.SchemaRegistry.Endpoint)
+	logger.Debug("Bootstrap Servers:" + configs.Kafka.Bootstrap_Servers)
 	schema.InitializeSchemaHandler(configs)
 	producer_client.InitializeProducers(configs.Kafka, configs.Env)
 
-	for i := 0; i < 2; i++ {
-		go lib.ProcessProtobufRequestChannel(configs.Kafka.Kafka_Topic_Protobuf)
-	}
-
 	for i := 0; i < configs.Server.Goroutines; i++ {
 		go lib.ProcessJsonRequestChannel(configs.Kafka.Kafka_Topic_Json)
 	}
@@ -49,12 +43,12 @@ func getConfigs() config.Configurations {
 
 	var configuration config.Configurations
 	if err := viper.ReadInConfig(); err != nil {
-		log.Fatalf("Error reading config file, %s\n", err)
+		log.Fatalln("Error reading config file, %s", err)
 	}
 
 	err := viper.Unmarshal(&configuration)
 	if err != nil {
-		log.Fatalf("Unable to decode into struct, %v\n", err)
+		log.Fatalln("Unable to decode into struct, %v", err)
 	}
 
 	// Following coinfigurations read from environment variables
@@ -76,7 +70,7 @@ func getConfigs() config.Configurations {
 func main() {
 	logger.Debug("Serving on http://0.0.0.0:" + port)
 	httpServer, err1 := server.NewServer(port, cors)
-	metricsServer, err2 := server.MetricServer(metrics_port)
+	metricsServer, err2 := server.MetricServer(METRICS_PORT)
 	if err1 != nil {
 		logger.Fatal("Unable to start server, %v", zap.String("error", err1.Error()))
 	}