Replace env for connection to NATS

ytfunction.go

@@ -110,8 +110,9 @@ type CallbackFunc struct {
 
 // Сервер инстанса
 type Serve struct {
-	NatsHost          string
-	NatsPort          string
+	//NatsHost          string
+	//NatsPort          string
+	NatsAddr          string
 	nc                *nats.Conn
 	hasNats           bool
 	projectName       string
@@ -128,7 +129,7 @@ type Serve struct {
 }
 
 // Создание нового инстанса сервера
-func NewServe(host string, port string, projectName string, moduleName string, natsServ *nats.Conn) *Serve {
+func NewServe(addr string, projectName string, moduleName string, natsServ *nats.Conn) *Serve {
 	if strings.Trim(moduleName, " ") == "" {
 		moduleName = "default"
 	} else {
@@ -145,8 +146,9 @@ func NewServe(host string, port string, projectName string, moduleName string, n
 	if natsServ != nil {
 		serve.nc = natsServ
 	} else {
-		serve.NatsHost = host
-		serve.NatsPort = port
+		/*serve.NatsHost = host
+		serve.NatsPort = port*/
+		serve.NatsAddr = addr
 	}
 	serve.projectName = projectName
 	serve.moduleName = moduleName
@@ -229,7 +231,7 @@ func (serve *Serve) natsErrHandler(nc *nats.Conn, sub *nats.Subscription, natsEr
 // Запуск текущего инстанса сервера
 func (serve *Serve) Run() (err error) {
 	if serve.nc == nil {
-		serve.nc, err = nats.Connect(fmt.Sprintf("nats://%s:%s", serve.NatsHost, serve.NatsPort), nats.ErrorHandler(serve.natsErrHandler))
+		serve.nc, err = nats.Connect(serve.NatsAddr, nats.ErrorHandler(serve.natsErrHandler))
 		if err != nil {
 			return
 		}

ytfunction_test.go

@@ -11,16 +11,20 @@ import (
 var serve *Serve
 
 func setup() {
-	host, exists := os.LookupEnv("NATS_HOST")
+	/*host, exists := os.LookupEnv("NATS_HOST")
 	if !exists {
 		host = "localhost"
+	}*/
+	addr, exists := os.LookupEnv("NATS_ADDR")
+	if !exists {
+		addr = "nats://localhost:4222"
 	}
-	port, exists := os.LookupEnv("NATS_PORT")
+	/*port, exists := os.LookupEnv("NATS_PORT")
 	if !exists {
 		port = "4222"
-	}
+	}*/
 
-	serve = NewServe(host, port, "", "test", nil)
+	serve = NewServe(addr, "", "test", nil)
 	if serve == nil {
 		panic(fmt.Errorf(`serve is not created`))
 	}