more tweaks

producer.go

@@ -3,7 +3,7 @@ package conejo
 import (
 	//"errors"
 	"github.com/streadway/amqp"
-	"log"
+	//"log"
 )
 
 func Publish(conn *amqp.Connection, queue Queue, exchange Exchange, body string) error {
@@ -13,50 +13,47 @@ func Publish(conn *amqp.Connection, queue Queue, exchange Exchange, body string)
 		return err
 	}
 	channel.Confirm(false)
+	defer channel.Close()
 	//ack, nack := channel.NotifyConfirm(make(chan uint64, 1), make(chan uint64, 1))
 
 	err = declareExchange(exchange, channel)
 	if err != nil {
 		return err
-	} else {
-
-		err := declareQueue(queue, channel)
-		if err != nil {
-			return err
-		} else {
-
-			err = channel.QueueBind(
-				queue.Name,    // queue name
-				queue.Name,    // @TODO - FIX ME!!!
-				exchange.Name, // exchange
-				false,
-				nil,
-			)
-			if err != nil {
-				return err
-			} else {
-
-				if err = channel.Publish(
-					exchange.Name, // publish to an exchange
-					queue.Name,    // routing to 0 or more queues
-					false,         // mandatory
-					false,         // immediate
-					amqp.Publishing{
-						Headers:         amqp.Table{},
-						ContentType:     "text/plain",
-						ContentEncoding: "",
-						Body:            []byte(body),
-						DeliveryMode:    amqp.Transient, // 1=non-persistent, 2=persistent
-						Priority:        0,              // 0-9
-					},
-				); err != nil {
-					return err
-				} else {
-					log.Println("CONEJO: Channel closed")
-					channel.Close()
-				}
-			}
-		}
 	}
+
+	err = declareQueue(queue, channel)
+	if err != nil {
+		return err
+	}
+
+	err = channel.QueueBind(
+		queue.Name,    // queue name
+		queue.Name,    // @TODO - FIX ME!!!
+		exchange.Name, // exchange
+		false,
+		nil,
+	)
+	if err != nil {
+		return err
+	}
+
+	err = channel.Publish(
+		exchange.Name, // publish to an exchange
+		queue.Name,    // routing to 0 or more queues
+		false,         // mandatory
+		false,         // immediate
+		amqp.Publishing{
+			Headers:         amqp.Table{},
+			ContentType:     "text/plain",
+			ContentEncoding: "",
+			Body:            []byte(body),
+			DeliveryMode:    amqp.Transient, // 1=non-persistent, 2=persistent
+			Priority:        0,              // 0-9
+		},
+	)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }