diff --git a/cmd/backend/backend.go b/cmd/backend/backend.go index b04aac8..cf29966 100644 --- a/cmd/backend/backend.go +++ b/cmd/backend/backend.go @@ -18,7 +18,7 @@ import ( var conf = config.New() func main() { - fmt.Println("Running backend service") + fmt.Println("[Backend service]") // Establish a Rabbit connection. conn, err := rabbit.GetConn(conf.RabbitURL) @@ -53,7 +53,7 @@ func printMessages(d amqp.Delivery) bool { // publishInput reads user input, marshals to json, and publishes to // a Rabbit exchange with the front-end and database routing keys. -func publishInput(conn *rabbit.Conn) { +func publishInput(c *rabbit.Conn) { reader := bufio.NewReader(os.Stdin) for { input, _ := reader.ReadString('\n') @@ -68,7 +68,7 @@ func publishInput(conn *rabbit.Conn) { log.Fatalf("marshal message: %s", err) } - err = conn.Publish(conf.Exchange, conf.KeyFront+"."+conf.KeyDB, message) + err = c.Publish(conf.Exchange, conf.KeyFront+"."+conf.KeyDB, message) if err != nil { log.Fatalf("publish message: %s", err) } diff --git a/cmd/database/database.go b/cmd/database/database.go index d481701..8544d24 100644 --- a/cmd/database/database.go +++ b/cmd/database/database.go @@ -16,7 +16,7 @@ import ( var conf = config.New() func main() { - fmt.Println("Running database service") + fmt.Println("[Database service]") // Postgres connection connP, err := pgx.Connect(context.Background(), conf.PostgresURL) @@ -46,14 +46,14 @@ func main() { } // insertToDB inserts a Rabbit message into a Postgres database. -func insertToDB(d amqp.Delivery, connP *pgx.Conn) bool { +func insertToDB(d amqp.Delivery, c *pgx.Conn) bool { var message models.Message err := json.Unmarshal(d.Body, &message) if err != nil { log.Fatalf("unmarshal message: %s", err) } - _, err = connP.Exec(context.Background(), "insert into messages (message, created) values ($1, to_timestamp($2))", message.Text, message.Time/1000) + _, err = c.Exec(context.Background(), "insert into messages (message, created) values ($1, to_timestamp($2))", message.Text, message.Time/1000) if err != nil { log.Fatalf("insert into database: %s", err) }