optional store traffic time

alireza0 · Apr 25, 2024 · 9a02e65 · 9a02e65
1 parent abb869c
commit 9a02e65
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 6 deletions.
diff --git a/backend/app/app.go b/backend/app/app.go
@@ -51,7 +51,13 @@ func (a *APP) Start() error {
 	if err != nil {
 		return err
 	}
-	err = a.cronJob.Start(loc)
+
+	trafficAge, err := a.SettingService.GetTrafficAge()
+	if err != nil {
+		return err
+	}
+
+	err = a.cronJob.Start(loc, trafficAge)
 	if err != nil {
 		return err
 	}

diff --git a/backend/cronjob/cronJob.go b/backend/cronjob/cronJob.go
@@ -14,7 +14,7 @@ func NewCronJob() *CronJob {
 	return &CronJob{}
 }
 
-func (c *CronJob) Start(loc *time.Location) error {
+func (c *CronJob) Start(loc *time.Location, trafficAge int) error {
 	c.cron = cron.New(cron.WithLocation(loc), cron.WithSeconds())
 	c.cron.Start()
 
@@ -24,7 +24,7 @@ func (c *CronJob) Start(loc *time.Location) error {
 		// Start expiry job
 		c.cron.AddJob("@every 1m", NewDepleteJob())
 		// Start deleting old stats
-		c.cron.AddJob("@daily", NewDelStatsJob())
+		c.cron.AddJob("@daily", NewDelStatsJob(trafficAge))
 	}()
 
 	return nil

diff --git a/backend/cronjob/delStatsJob.go b/backend/cronjob/delStatsJob.go
@@ -7,14 +7,17 @@ import (
 
 type DelStatsJob struct {
 	service.StatsService
+	trafficAge int
 }
 
-func NewDelStatsJob() *DelStatsJob {
-	return &DelStatsJob{}
+func NewDelStatsJob(ta int) *DelStatsJob {
+	return &DelStatsJob{
+		trafficAge: ta,
+	}
 }
 
 func (s *DelStatsJob) Run() {
-	err := s.StatsService.DelOldStats(30)
+	err := s.StatsService.DelOldStats(s.trafficAge)
 	if err != nil {
 		logger.Warning("Deleting old statistics failed: ", err)
 		return

diff --git a/backend/service/setting.go b/backend/service/setting.go
@@ -24,6 +24,7 @@ var defaultValueMap = map[string]string{
 	"webPath":       "/app/",
 	"webURI":        "",
 	"sessionMaxAge": "0",
+	"trafficAge":    "30",
 	"timeLocation":  "Asia/Tehran",
 	"subListen":     "",
 	"subPort":       "2096",
@@ -204,6 +205,10 @@ func (s *SettingService) GetSessionMaxAge() (int, error) {
 	return s.getInt("sessionMaxAge")
 }
 
+func (s *SettingService) GetTrafficAge() (int, error) {
+	return s.getInt("trafficAge")
+}
+
 func (s *SettingService) GetTimeLocation() (*time.Location, error) {
 	l, err := s.getString("timeLocation")
 	if err != nil {

diff --git a/frontend/src/locales/en.ts b/frontend/src/locales/en.ts
@@ -102,6 +102,7 @@ export default {
     sslCert: "SSL Certificate Path",
     webUri: "Panel URI",
     sessionAge: "Session Maximum Age",
+    trafficAge: "Traffic Maximum Age",
     timeLoc: "Timezone Location",
     subEncode: "Enable Encoding",
     subInfo: "Enable Client Info",

diff --git a/frontend/src/locales/fa.ts b/frontend/src/locales/fa.ts
@@ -102,6 +102,7 @@ export default {
     sslCert: "مسیر فایل گواهی",
     webUri: "آدرس نهایی پنل",
     sessionAge: "بیشینه زمان لاگین ماندن",
+    trafficAge: "بیشینه زمان ذخیره ترافیک",
     timeLoc: "منطقه زمانی",
     subEncode: "رمزگذاری",
     subInfo: "نمایش اطلاعات کاربر",

diff --git a/frontend/src/locales/vi.ts b/frontend/src/locales/vi.ts
@@ -102,6 +102,7 @@ export default {
     sslCert: "Đường dẫn chứng chỉ SSL",
     webUri: "URI bảng điều khiển",
     sessionAge: "Tuổi tối đa của phiên",
+    trafficAge: "Tuổi lưu thông tối đa",
     timeLoc: "Vị trí múi giờ",
     subEncode: "Kích hoạt mã hóa",
     subInfo: "Kích hoạt thông tin khách hàng",

diff --git a/frontend/src/locales/zhcn.ts b/frontend/src/locales/zhcn.ts
@@ -102,6 +102,7 @@ export default {
     sslCert: "SSL 证书 (cert) 路径",
     webUri: "面板 URI",
     sessionAge: "会话最大连接数",
+    trafficAge: "流量最大年龄",
     timeLoc: "时区",
     subEncode: "启用编码",
     subInfo: "启用用户信息",

diff --git a/frontend/src/locales/zhtw.ts b/frontend/src/locales/zhtw.ts
@@ -102,6 +102,7 @@ export default {
     sslCert: "SSL 證書 (cert) 路徑",
     webUri: "面板 URI",
     sessionAge: "會話最大連接數",
+    trafficAge: "流量最大年齡",
     timeLoc: "時區",
     subEncode: "啟用編碼",
     subInfo: "啟用用戶信息",

diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
@@ -52,6 +52,16 @@
               type="number"
               v-model.number="sessionMaxAge"
               :label="$t('setting.sessionAge')"
+              :suffix="$t('date.h')"
+              hide-details
+              ></v-text-field>
+          </v-col>
+          <v-col cols="12" sm="6" md="4">
+            <v-text-field
+              type="number"
+              v-model.number="trafficAge"
+              :label="$t('setting.trafficAge')"
+              :suffix="$t('date.d')"
               hide-details
               ></v-text-field>
           </v-col>
@@ -152,6 +162,7 @@ const settings = ref({
   webPath: "/app/",
   webURI: "",
 	sessionMaxAge: "0",
+  trafficAge: "30",
 	timeLocation: "Asia/Tehran",
   subListen: "",
 	subPort: "2096",
@@ -246,6 +257,11 @@ const sessionMaxAge = computed({
   set: (v:number) => { settings.value.sessionMaxAge = v.toString() }
 })
 
+const trafficAge = computed({
+  get: () => { return parseInt(settings.value.trafficAge) },
+  set: (v:number) => { settings.value.trafficAge = v.toString() }
+})
+
 const subPort = computed({
   get: () => { return parseInt(settings.value.subPort) },
   set: (v:number) => { settings.value.subPort = v.toString() }