Restructure again

This commit is contained in:
Eden Kirin
2023-10-26 16:49:24 +02:00
parent 7512d75a4d
commit dd671d561c
5 changed files with 32 additions and 27 deletions

View File

@ -2,7 +2,9 @@ package main
import (
"fmt"
"iris-test/app/common"
"iris-test/app/lib/cfg"
"iris-test/app/lib/db"
"iris-test/app/lib/logging"
"iris-test/app/views"
"os"
"time"
@ -16,17 +18,17 @@ import (
var redisDB *redis.Database
func createSessionEngine() *sessions.Sessions {
redisAddr := fmt.Sprintf("%s:%d", common.Config.Redis.Host, common.Config.Redis.Port)
redisAddr := fmt.Sprintf("%s:%d", cfg.Config.Redis.Host, cfg.Config.Redis.Port)
redisDB = redis.New(redis.Config{
Network: "tcp",
Addr: redisAddr,
Timeout: time.Duration(30) * time.Second,
MaxActive: 10,
Username: common.Config.Redis.Username,
Password: common.Config.Redis.Password,
Database: common.Config.Redis.Database,
Prefix: common.Config.Redis.Prefix,
Username: cfg.Config.Redis.Username,
Password: cfg.Config.Redis.Password,
Database: cfg.Config.Redis.Database,
Prefix: cfg.Config.Redis.Prefix,
Driver: redis.GoRedis(), // defaults to this driver.
// To set a custom, existing go-redis client, use the "SetClient" method:
// Driver: redis.GoRedis().SetClient(customGoRedisClient)
@ -84,7 +86,7 @@ func createApp() *iris.Application {
accessLog := createAccessLog()
app := iris.New()
app.Logger().SetLevel(common.Config.Application.LogLevel)
app.Logger().SetLevel(cfg.Config.Application.LogLevel)
app.Use(sessionsEngine.Handler())
app.UseRouter(accessLog.Handler)
app.RegisterView(iris.Jet("./app/templates", ".jet").Reload(true))
@ -93,9 +95,9 @@ func createApp() *iris.Application {
}
func main() {
common.InitCfg()
common.InitLogging()
common.InitDB()
cfg.InitCfg()
logging.InitLogging()
db.InitDB()
app := createApp()
defer redisDB.Close()