Add recovery and logger

spo-iitk · Jun 26, 2022 · fe1e28e · fe1e28e
1 parent b8cf865
commit fe1e28e
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 9 deletions.
diff --git a/application/config.go b/application/config.go
@@ -6,6 +6,7 @@ import (
 	_ "github.com/spo-iitk/ras-backend/config"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 var db *gorm.DB
@@ -22,7 +23,7 @@ func openConnection() {
 	dsn += " dbname=" + dbName + " port=" + port + " sslmode=disable TimeZone=Asia/Kolkata"
 
 	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
-		// Logger: logger.Default.LogMode(logger.Info),
+		Logger: logger.Default.LogMode(logger.Info),
 	})
 	if err != nil {
 		logrus.Fatal("Failed to connect to application database: ", err)
@@ -34,7 +35,7 @@ func openConnection() {
 	err = db.AutoMigrate(&Proforma{}, &ApplicationQuestion{}, &ApplicationQuestionAnswer{},
 		&ProformaEvent{}, &EventCoordinator{}, &EventStudent{})
 	if err != nil {
-		logrus.Fatal("Failed to migrate application database: ", err)
+	logrus.Fatal("Failed to migrate application database: ", err)
 		panic(err)
 	}
 

diff --git a/auth/config.go b/auth/config.go
@@ -7,6 +7,7 @@ import (
 	_ "github.com/spo-iitk/ras-backend/config"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 var db *gorm.DB
@@ -23,7 +24,7 @@ func openConnection() {
 	dsn += " dbname=" + dbName + " port=" + port + " sslmode=disable TimeZone=Asia/Kolkata"
 
 	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
-		// Logger: logger.Default.LogMode(logger.Info),
+		Logger: logger.Default.LogMode(logger.Info),
 	})
 	if err != nil {
 		logrus.Fatal("Failed to connect to auth database: ", err)

diff --git a/cmd/admin.go b/cmd/admin.go
@@ -19,6 +19,8 @@ func adminRCServer(mail_channel chan mail.Mail) *http.Server {
 	engine.Use(middleware.CORS())
 	engine.Use(middleware.Authenticator())
 	engine.Use(middleware.EnsureAdmin())
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	rc.AdminRouter(mail_channel, engine)
 
@@ -38,6 +40,8 @@ func adminApplicationServer(mail_channel chan mail.Mail) *http.Server {
 	engine.Use(middleware.CORS())
 	engine.Use(middleware.Authenticator())
 	engine.Use(middleware.EnsureAdmin())
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	application.AdminRouter(mail_channel, engine)
 
@@ -57,6 +61,8 @@ func adminCompanyServer() *http.Server {
 	engine.Use(middleware.CORS())
 	engine.Use(middleware.Authenticator())
 	engine.Use(middleware.EnsureAdmin())
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	company.AdminRouter(engine)
 

diff --git a/cmd/auth.go b/cmd/auth.go
@@ -14,6 +14,9 @@ func authServer(mail_channel chan mail.Mail) *http.Server {
 	PORT := viper.GetString("PORT.AUTH")
 	r := gin.New()
 	r.Use(middleware.CORS())
+	r.Use(gin.Recovery())
+	r.Use(gin.Logger())
+
 	auth.Router(mail_channel, r)
 
 	server := &http.Server{

diff --git a/cmd/company.go b/cmd/company.go
@@ -15,6 +15,8 @@ func companyServer() *http.Server {
 	engine := gin.New()
 	engine.Use(middleware.CORS())
 	engine.Use(middleware.Authenticator())
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	rc.CompanyRouter(engine)
 	application.CompanyRouter(engine)

diff --git a/cmd/main.go b/cmd/main.go
@@ -4,7 +4,6 @@ import (
 	"log"
 	"time"
 
-	"github.com/gin-gonic/gin"
 	_ "github.com/spo-iitk/ras-backend/config"
 	"github.com/spo-iitk/ras-backend/mail"
 	"golang.org/x/sync/errgroup"
@@ -21,8 +20,6 @@ func main() {
 
 	go mail.Service(mail_channel)
 
-	gin.SetMode(gin.ReleaseMode)
-
 	g.Go(func() error {
 		return authServer(mail_channel).ListenAndServe()
 	})

diff --git a/cmd/ras.go b/cmd/ras.go
@@ -16,6 +16,8 @@ func rasServer(mail_channel chan mail.Mail) *http.Server {
 	engine.Use(middleware.CORS())
 	// engine.Use(middleware.Authenticator())
 	ras.RASRouter(mail_channel, engine)
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	server := &http.Server{
 		Addr:         ":" + PORT,

diff --git a/cmd/student.go b/cmd/student.go
@@ -16,6 +16,8 @@ func studentServer() *http.Server {
 	engine := gin.New()
 	engine.Use(middleware.CORS())
 	engine.Use(middleware.Authenticator())
+	engine.Use(gin.Recovery())
+	engine.Use(gin.Logger())
 
 	student.StudentRouter(engine)
 	rc.StudentRouter(engine)

diff --git a/company/config.go b/company/config.go
@@ -5,6 +5,7 @@ import (
 	"github.com/spf13/viper"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 var db *gorm.DB
@@ -20,7 +21,9 @@ func openConnection() {
 	dsn := "host=" + host + " user=" + user + " password=" + password
 	dsn += " dbname=" + dbName + " port=" + port + " sslmode=disable TimeZone=Asia/Kolkata"
 
-	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
+	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Info),
+	})
 	if err != nil {
 		logrus.Fatal("Failed to connect to company database: ", err)
 		panic(err)

diff --git a/rc/config.go b/rc/config.go
@@ -5,6 +5,7 @@ import (
 	"github.com/spf13/viper"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 var db *gorm.DB
@@ -21,7 +22,7 @@ func openConnection() {
 	dsn += " dbname=" + dbName + " port=" + port + " sslmode=disable TimeZone=Asia/Kolkata"
 
 	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
-		// Logger: logger.Default.LogMode(logger.Info),
+		Logger: logger.Default.LogMode(logger.Info),
 	})
 	if err != nil {
 		logrus.Fatal("Failed to connect to cycle database: ", err)

diff --git a/student/config.go b/student/config.go
@@ -7,6 +7,7 @@ import (
 	_ "github.com/spo-iitk/ras-backend/config"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 )
 
 var db *gorm.DB
@@ -22,7 +23,9 @@ func openConnection() {
 	dsn := "host=" + host + " user=" + user + " password=" + password
 	dsn += " dbname=" + dbName + " port=" + port + " sslmode=disable TimeZone=Asia/Kolkata"
 
-	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{})
+	database, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Info),
+	})
 	if err != nil {
 		logrus.Fatal("Failed to connect to student database: ", err)
 		panic(err)