improve config: moved the config create to the relevant package (#98)

Signed-off-by: Login Victor <[email protected]>

mend

improve config: moved the config create to the relevant package

Author: batazor

cmd/app/main.go

@@ -3,21 +3,17 @@ package main
 import (
 	"log"
 
-	"github.com/ilyakaznacheev/cleanenv"
-
 	"github.com/evrone/go-clean-template/config"
 	"github.com/evrone/go-clean-template/internal/app"
 )
 
 func main() {
 	// Configuration
-	var cfg config.Config
-
-	err := cleanenv.ReadConfig("./config/config.yml", &cfg)
+	cfg, err := config.NewConfig()
 	if err != nil {
 		log.Fatalf("Config error: %s", err)
 	}
 
 	// Run
-	app.Run(&cfg)
+	app.Run(cfg)
 }

config/config.go

@@ -1,5 +1,11 @@
 package config
 
+import (
+	"fmt"
+
+	"github.com/ilyakaznacheev/cleanenv"
+)
+
 type (
 	// Config -.
 	Config struct {
@@ -39,3 +45,20 @@ type (
 		URL            string `env-required:"true"                            env:"RMQ_URL"`
 	}
 )
+
+// NewConfig returns app config.
+func NewConfig() (*Config, error) {
+	cfg := &Config{}
+
+	err := cleanenv.ReadConfig("./config/config.yml", cfg)
+	if err != nil {
+		return nil, fmt.Errorf("config error: %w", err)
+	}
+
+	err = cleanenv.ReadEnv(cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return cfg, nil
+}

pkg/rabbitmq/rmq_rpc/client/client.go

@@ -45,7 +45,7 @@ type Client struct {
 	error          chan error
 	stop           chan struct{}
 
-	sync.RWMutex
+	rw    sync.RWMutex
 	calls map[string]*pendingCall
 
 	timeout time.Duration
@@ -198,9 +198,9 @@ func (c *Client) reconnect() {
 }
 
 func (c *Client) getCall(d *amqp.Delivery) {
-	c.RLock()
+	c.rw.RLock()
 	call, ok := c.calls[d.CorrelationId]
-	c.RUnlock()
+	c.rw.RUnlock()
 
 	if !ok {
 		return
@@ -212,15 +212,15 @@ func (c *Client) getCall(d *amqp.Delivery) {
 }
 
 func (c *Client) addCall(corrID string, call *pendingCall) {
-	c.Lock()
+	c.rw.Lock()
 	c.calls[corrID] = call
-	c.Unlock()
+	c.rw.Unlock()
 }
 
 func (c *Client) deleteCall(corrID string) {
-	c.Lock()
+	c.rw.Lock()
 	delete(c.calls, corrID)
-	c.Unlock()
+	c.rw.Unlock()
 }
 
 // Notify -.