Separate run command from main function
This commit is contained in:
@ -14,6 +14,7 @@ import (
|
||||
)
|
||||
|
||||
var log *logger.AggregatedLogger
|
||||
var DB Database
|
||||
|
||||
type mySQLdb struct {
|
||||
*gorm.DB
|
||||
@ -23,6 +24,13 @@ type postgresDB struct {
|
||||
*gorm.DB
|
||||
}
|
||||
|
||||
type SSLMode string
|
||||
|
||||
const (
|
||||
DisableSSL SSLMode = "disable"
|
||||
EnableSSL SSLMode = "enable"
|
||||
)
|
||||
|
||||
type Database interface {
|
||||
IsUserRegistered(email string, username string) bool
|
||||
|
||||
@ -79,9 +87,9 @@ func NewMYSQLdb(username, password, host, port, dbName string) Database {
|
||||
return &mySQLdb{DB}
|
||||
}
|
||||
|
||||
func NewPostgresDB(username, password, host, port, dbName string) Database {
|
||||
func NewPostgresDB(username, password, host, port, dbName string, mode SSLMode) Database {
|
||||
var err error
|
||||
connection := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=%s TimeZone=Asia/Jakarta", host, username, password, dbName, port, "disable")
|
||||
connection := fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%s sslmode=%s TimeZone=Asia/Jakarta", host, username, password, dbName, port, mode)
|
||||
DB, err := gorm.Open(postgres.New(postgres.Config{
|
||||
DSN: connection,
|
||||
}), &gorm.Config{
|
||||
|
@ -2,7 +2,6 @@ package user
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/fossyy/filekeeper/utils"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@ -27,12 +26,8 @@ type UserWithExpired struct {
|
||||
var log *logger.AggregatedLogger
|
||||
var UserCache *Cache
|
||||
|
||||
// TESTTING VAR
|
||||
var database db.Database
|
||||
|
||||
func init() {
|
||||
log = logger.Logger()
|
||||
database = db.NewPostgresDB(utils.Getenv("DB_USERNAME"), utils.Getenv("DB_PASSWORD"), utils.Getenv("DB_HOST"), utils.Getenv("DB_PORT"), utils.Getenv("DB_NAME"))
|
||||
|
||||
UserCache = &Cache{users: make(map[string]*UserWithExpired)}
|
||||
ticker := time.NewTicker(time.Hour * 8)
|
||||
@ -66,7 +61,7 @@ func Get(email string) (*UserWithExpired, error) {
|
||||
return user, nil
|
||||
}
|
||||
|
||||
userData, err := database.GetUser(email)
|
||||
userData, err := db.DB.GetUser(email)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user