git-svn-id: svn://47.119.165.148/zhub@102 e63fbceb-bcc3-4977-ac22-735b83d8d0f4
This commit is contained in:
lxy
2021-02-06 08:53:13 +00:00
parent 0aa0abb762
commit 6d79481ce0
2 changed files with 9 additions and 3 deletions

View File

@@ -12,6 +12,7 @@ import (
var ( var (
config = make(map[string]string) config = make(map[string]string)
LogDebug bool LogDebug bool
DataDir = ""
) )
func Load(path string) { func Load(path string) {
@@ -54,6 +55,8 @@ func Load(path string) {
} }
LogDebug = strings.EqualFold(config["log.level"], "debug") LogDebug = strings.EqualFold(config["log.level"], "debug")
DataDir = GetStr("data.dir", "data")
os.MkdirAll(DataDir, os.ModeDir)
} }
func GetStr(key string, def string) string { func GetStr(key string, def string) string {

View File

@@ -8,6 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
"zhub/conf"
) )
var ( var (
@@ -38,18 +39,20 @@ func Append(str string, fileName string) {
func (s *ZSub) saveDelay() { func (s *ZSub) saveDelay() {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
err := os.Remove("delay.z") err := os.Remove(conf.DataDir + "/delay.z")
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
var str string
for _, delay := range s.delays { for _, delay := range s.delays {
Append(fmt.Sprintf("%s %s %s\n", delay.topic, delay.value, strconv.FormatInt(delay.exectime.Unix(), 10)), "delay.z") str += fmt.Sprintf("%s %s %s\n", delay.topic, delay.value, strconv.FormatInt(delay.exectime.Unix(), 10))
} }
Append(str, conf.DataDir+"/delay.z")
} }
func (s *ZSub) reloadDelay() { func (s *ZSub) reloadDelay() {
f, err := os.Open("delay.z") f, err := os.Open(conf.DataDir + "/delay.z")
if err != nil { if err != nil {
return return
} }