Commit 65d395a1 authored by Erhan's avatar Erhan
Browse files

[CHORE]

Some useless lines removed and edits
parent cb5f2127
...@@ -4,6 +4,7 @@ import( ...@@ -4,6 +4,7 @@ import(
//Local Packages //Local Packages
"net/http" "net/http"
"encoding/json" "encoding/json"
//ThisProject Packages //ThisProject Packages
models "bulkmail/packages/Data/Models" models "bulkmail/packages/Data/Models"
myLog "bulkmail/packages/Utils/Logger" myLog "bulkmail/packages/Utils/Logger"
...@@ -19,7 +20,5 @@ func AddToQueue(w http.ResponseWriter, r *http.Request){ ...@@ -19,7 +20,5 @@ func AddToQueue(w http.ResponseWriter, r *http.Request){
myLog.FailOnError(err, "Failed data can't converting") myLog.FailOnError(err, "Failed data can't converting")
} }
//go rabbit.GetInstance()
//rabbit.AddToQueue(body)
rabbit.AddToQueue(body) rabbit.AddToQueue(body)
} }
\ No newline at end of file
...@@ -3,8 +3,10 @@ package MongoDb ...@@ -3,8 +3,10 @@ package MongoDb
import( import(
//Local Packages //Local Packages
"context" "context"
//This Project Packages //This Project Packages
myLogger "bulkmail/packages/Utils/Logger" myLogger "bulkmail/packages/Utils/Logger"
//Online Packages //Online Packages
//bson "go.mongodb.org/mongo-driver/bson" //bson "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
...@@ -31,28 +33,5 @@ func InsertOne(data string){ ...@@ -31,28 +33,5 @@ func InsertOne(data string){
if er != nil { if er != nil {
myLogger.FailOnError(err, "INSERT ONE FAILED") myLogger.FailOnError(err, "INSERT ONE FAILED")
} }
myLogger.Print("inserted") myLogger.Print("inserted")//!!
} }
\ No newline at end of file
// func GetConnection() **mongo.Client{
// client, err = mongo.NewClient(options.Client().ApplyURI("mongodb://localhost:27017"))
// if err!= nil{
// log.Fatal(err)
// }
// ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
// err = client.Connect(ctx)
// if err!= nil{
// log.Fatal(err)
// }
// defer client.Disconnect(ctx)
// return &client
// }
// func GetDatabase(clnt *mongo.Client) *mongo.Database{
// return clnt.Database("test")
// }
// func GetCollection(db *mongo.Database) *mongo.Collection{
// return db.Collection("testcollect")
// }
\ No newline at end of file
...@@ -4,29 +4,26 @@ import( ...@@ -4,29 +4,26 @@ import(
//Local Packages //Local Packages
"log" "log"
"sync" "sync"
//This Project Packages //This Project Packages
myMongo "bulkmail/packages/DataAccess/MongoDb" myMongo "bulkmail/packages/DataAccess/MongoDb"
//"bulkmail/packages/Data/Models" //"bulkmail/packages/Data/Models"
myLogger "bulkmail/packages/Utils/Looger"
//Git Packages //Git Packages
amqp "github.com/rabbitmq/amqp091-go" amqp "github.com/rabbitmq/amqp091-go"
//"go.mongodb.org/mongo-driver/mongo" //"go.mongodb.org/mongo-driver/mongo"
) )
func failOnError(err error, msg string) {
if err != nil {
log.Panicf("%s: %s", msg, err)
}
}
func Consumer(wg *sync.WaitGroup) { func Consumer(wg *sync.WaitGroup) {
defer wg.Done() defer wg.Done()
//Rabbit Connection //Rabbit Connection
conn, err := amqp.Dial("amqp://root:root@localhost:5672/") conn, err := amqp.Dial("amqp://root:root@localhost:5672/")
failOnError(err, "Failed to connect to RabbitMQ") myLogger.FailOnError(err, "Failed to connect to RabbitMQ")
defer conn.Close() defer conn.Close()
//Rabbit Channel //Rabbit Channel
ch, err := conn.Channel() ch, err := conn.Channel()
failOnError(err, "Failed to open a channel") myLogger.FailOnError(err, "Failed to open a channel")
defer ch.Close() defer ch.Close()
//Rabbit Queue //Rabbit Queue
q, err := ch.QueueDeclare( q, err := ch.QueueDeclare(
...@@ -37,7 +34,7 @@ func Consumer(wg *sync.WaitGroup) { ...@@ -37,7 +34,7 @@ func Consumer(wg *sync.WaitGroup) {
false, // no-wait false, // no-wait
nil, // arguments nil, // arguments
) )
failOnError(err, "Failed to declare a queue") myLogger.FailOnError(err, "Failed to declare a queue")
msgs, err := ch.Consume( msgs, err := ch.Consume(
q.Name, // queue q.Name, // queue
...@@ -48,26 +45,19 @@ func Consumer(wg *sync.WaitGroup) { ...@@ -48,26 +45,19 @@ func Consumer(wg *sync.WaitGroup) {
false, // no-wait false, // no-wait
nil, // args nil, // args
) )
failOnError(err, "Failed to register a consumer") myLogger.FailOnError(err, "Failed to register a consumer")
var forever chan struct{} var forever chan struct{}
// //var clnt *mongo.Client
// clnt:= myMongo.GetConnection()
// db:=myMongo.GetDatabase(*clnt)
// col:=myMongo.GetCollection(db)
// col.InsertOne()
//var mail Models.Mail
go func() { go func() {
for d := range msgs { for d := range msgs {
log.Printf("Received a message: %s", d.Body) myLogger.PrintData("Received a message => ", d.Body)
myMongo.GetClient("test","testcol") myMongo.GetClient("test","testcol")
myMongo.InsertOne("test") myMongo.InsertOne("test")
} }
}() }()
log.Printf(" [*] Waiting for messages. To exit press CTRL+C") myLogger.Print("Waiting for messages. To exit press CTRL+C")
<-forever <-forever
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ package Controllers ...@@ -3,6 +3,7 @@ package Controllers
import( import(
//Local Packages //Local Packages
"net/http" "net/http"
//This Project Packages //This Project Packages
bsns "bulkmail/packages/Business" bsns "bulkmail/packages/Business"
) )
......
...@@ -5,14 +5,15 @@ import( ...@@ -5,14 +5,15 @@ import(
"net/http" "net/http"
"log" "log"
"sync" "sync"
//This Project Packages //This Project Packages
"bulkmail/packages/Presentation/WebAPI/Controllers" "bulkmail/packages/Presentation/WebAPI/Controllers"
"bulkmail/packages/Utils/Logger" myLogger "bulkmail/packages/Utils/Logger"
) )
func WebAPI(wg *sync.WaitGroup) { func WebAPI(wg *sync.WaitGroup) {
defer wg.Done() defer wg.Done()
Controllers.SendMail() Controllers.SendMail()
Logger.Print("Server Started") myLogger.Print("Server Started")
log.Fatal(http.ListenAndServe(":10000", nil)) log.Fatal(http.ListenAndServe(":10000", nil))
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ package RabbitMQ ...@@ -3,6 +3,7 @@ package RabbitMQ
import( import(
//This Project Packages //This Project Packages
myLog "bulkmail/packages/Utils/Logger" myLog "bulkmail/packages/Utils/Logger"
//Git Packages //Git Packages
amqp "github.com/rabbitmq/amqp091-go" amqp "github.com/rabbitmq/amqp091-go"
) )
...@@ -37,5 +38,5 @@ func AddToQueue(body []byte){ ...@@ -37,5 +38,5 @@ func AddToQueue(body []byte){
Body: body, Body: body,
}) })
myLog.FailOnError(er, "Failed to publish a message") myLog.FailOnError(er, "Failed to publish a message")
myLog.PrintData("Sended this data =>", body)//Logger myLog.PrintData("Sended this data => ", body)//Logger
} }
\ No newline at end of file
...@@ -3,6 +3,7 @@ package main ...@@ -3,6 +3,7 @@ package main
import( import(
//Local Packages //Local Packages
"sync" "sync"
//This Project Packages //This Project Packages
"bulkmail/packages/Presentation/WebAPI" "bulkmail/packages/Presentation/WebAPI"
"bulkmail/packages/Presentation/Consumer" "bulkmail/packages/Presentation/Consumer"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment