From e0504f688abc5587837abb35e2c1cd39f650c6d0 Mon Sep 17 00:00:00 2001
From: mountain <mountain@action2quare.com>
Date: Thu, 31 Aug 2023 21:17:51 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/tavern.go |  7 +++----
 go.mod         |  2 +-
 go.sum         |  4 ++++
 main.go        | 11 +----------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/core/tavern.go b/core/tavern.go
index f20df74..3b471ab 100644
--- a/core/tavern.go
+++ b/core/tavern.go
@@ -16,6 +16,7 @@ import (
 	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/flagx"
 	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/session"
 	"repositories.action2quare.com/ayo/gocommon/wshandler"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -66,10 +67,8 @@ func readBsonDoc(r io.Reader, src any) error {
 }
 
 type TavernConfig struct {
-	gocommon.StorageAddr `json:"storage"`
-
-	SessionTTL     int64  `json:"maingate_session_ttl"`
-	SessionStorage string `json:"maingate_session_storage"`
+	session.SessionConfig `json:",inline"`
+	gocommon.StorageAddr  `json:"storage"`
 
 	Group            map[string]configDocument `json:"tavern_group_types"`
 	MaingateApiToken string                    `json:"maingate_api_token"`
diff --git a/go.mod b/go.mod
index 8369466..38d16ec 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/go-redis/redis/v8 v8.11.5
 	go.mongodb.org/mongo-driver v1.11.7
-	repositories.action2quare.com/ayo/gocommon v0.0.0-20230831115717-58de9a3f0cc2
+	repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121619-9e9d91b5a30f
 )
 
 require (
diff --git a/go.sum b/go.sum
index 7c0867a..fc7bb56 100644
--- a/go.sum
+++ b/go.sum
@@ -150,3 +150,7 @@ repositories.action2quare.com/ayo/gocommon v0.0.0-20230831113900-57b518562eac h1
 repositories.action2quare.com/ayo/gocommon v0.0.0-20230831113900-57b518562eac/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw=
 repositories.action2quare.com/ayo/gocommon v0.0.0-20230831115717-58de9a3f0cc2 h1:/StJeWqAY94RJ5SWgShQEsHCsfi0zX4IAAS+qLSocJc=
 repositories.action2quare.com/ayo/gocommon v0.0.0-20230831115717-58de9a3f0cc2/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121208-90502c3029c5 h1:nzzZM5XEf4yI+zc7GQ9QKr02Y9MUGuNVgUGV52Yie3o=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121208-90502c3029c5/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121619-9e9d91b5a30f h1:X4NTuEgFodH8CStrjNw0uYA9P8oJzjflH9TboKt67gg=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230831121619-9e9d91b5a30f/go.mod h1:PdpZ16O1czKKxCxn+0AFNaEX/0kssYwC3G8jR0V7ybw=
diff --git a/main.go b/main.go
index 0a955a7..e680fc4 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,6 @@ package main
 import (
 	"context"
 	"net/http"
-	"time"
 
 	"repositories.action2quare.com/ayo/gocommon/flagx"
 	"repositories.action2quare.com/ayo/gocommon/wshandler"
@@ -26,15 +25,7 @@ func main() {
 		panic(err)
 	}
 
-	if len(config.SessionStorage) == 0 {
-		panic("maingate_session_storage is missing")
-	}
-
-	if config.SessionTTL == 0 {
-		config.SessionTTL = 3600
-	}
-
-	consumer, err := session.NewConsumer(ctx, config.SessionStorage, time.Duration(config.SessionTTL)*time.Second)
+	consumer, err := session.NewConsumerWithConfig(ctx, config.SessionConfig)
 	if err != nil {
 		panic(err)
 	}