♻️ refactor: updated codebase #7

sivaosorg · Nov 29, 2023 · a9913cf · a9913cf
1 parent b7b14f2
commit a9913cf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/rabbitmqconn/rabbitmqconn.go b/rabbitmqconn/rabbitmqconn.go
@@ -42,6 +42,11 @@ func (r *RabbitMq) SetClose(value bool) *RabbitMq {
 	return r
 }
 
+func (r *RabbitMq) SetState(value dbx.Dbx) *RabbitMq {
+	r.State = value
+	return r
+}
+
 func (r *RabbitMq) GetConn() *amqp.Connection {
 	return r.conn
 }
@@ -60,7 +65,8 @@ func NewClient(config rabbitmqx.RabbitMqConfig) (*RabbitMq, dbx.Dbx) {
 		s.SetConnected(false).
 			SetMessage("RabbitMQ unavailable").
 			SetError(fmt.Errorf(s.Message))
-		return &RabbitMq{}, *s
+		instance = NewRabbitMq().SetState(*s)
+		return instance, *s
 	}
 	if instance != nil {
 		s.SetConnected(true).SetNewInstance(false)
@@ -73,19 +79,21 @@ func NewClient(config rabbitmqx.RabbitMqConfig) (*RabbitMq, dbx.Dbx) {
 	conn, err := amqp.DialConfig(config.ToUrlConn(), amqp.Config{Dial: amqp.DefaultDial(config.Timeout)})
 	if err != nil {
 		s.SetConnected(false).SetError(err).SetMessage(err.Error())
-		return &RabbitMq{}, *s
+		instance = NewRabbitMq().SetState(*s)
+		return instance, *s
 	}
 	channel, err := conn.Channel()
 	if err != nil {
 		s.SetConnected(false).SetError(err).SetMessage(err.Error())
-		return &RabbitMq{}, *s
+		instance = NewRabbitMq().SetState(*s)
+		return instance, *s
 	}
 	if config.DebugMode {
 		_logger.Info(fmt.Sprintf("RabbitMQ client connection:: %s", config.Json()))
 		_logger.Info(fmt.Sprintf("Connected successfully to rabbitmq:: %s", config.ToUrlConn()))
 	}
 	pid := os.Getpid()
-	s.SetConnected(true).SetMessage("Connection established").SetPid(pid).SetNewInstance(true)
+	s.SetConnected(true).SetMessage("Connection successfully").SetPid(pid).SetNewInstance(true)
 	instance = NewRabbitMq().SetConn(conn).SetChannel(channel).SetConfig(config)
 	return instance, *s
 }

diff --git a/rabbitmqconn/rabbitmqconn_model.go b/rabbitmqconn/rabbitmqconn_model.go
@@ -2,11 +2,13 @@ package rabbitmqconn
 
 import (
 	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/sivaosorg/govm/dbx"
 	"github.com/sivaosorg/govm/rabbitmqx"
 )
 
 type RabbitMq struct {
 	Config  rabbitmqx.RabbitMqConfig `json:"config,omitempty"`
+	State   dbx.Dbx                  `json:"state,omitempty"`
 	conn    *amqp.Connection         `json:"-"`
 	channel *amqp.Channel            `json:"-"`
 	close   bool                     `json:"-"`