.gitignore

@@ -16,7 +16,7 @@
 *.out
 
 # Dependency directories (remove the comment below to include it)
-vendor/
+# vendor/
 
 # Go workspace file
 go.work

README.md

@@ -1,64 +1,2 @@
 # godaemon
 
-A simple daemon library for Go.
-
-Features:
-- provide a daemon process
-- can use command to start/stop/restart the daemon
-
-Usage:
-```go
-import (
-	"time"
-
-	"git.pyer.club/kingecg/godaemon"
-	"git.pyer.club/kingecg/gologger"
-)
-
-var daemon *godaemon.GoDaemon
-
-func main() {
-	gologger.Configure(gologger.LoggersConfig{
-		Appenders: map[string]gologger.LogAppenderConfig{
-			"flog": {
-				Type: "console",
-			},
-		},
-		Categories: map[string]gologger.LogConfig{
-			"default": {
-				Appenders: []string{"flog"},
-				Level:     "debug",
-			},
-		},
-	})
-	daemon := godaemon.NewGoDaemon(start, stop)
-	daemon.Start()
-}
-
-func start(g *godaemon.GoDaemon) {
-	l := gologger.GetLogger("task")
-	for {
-		time.Sleep(time.Second * 1)
-		l.Debug("task running:", g.GetPid())
-	}
-}
-
-func stop(g *godaemon.GoDaemon) {
-	l := gologger.GetLogger("task")
-	l.Debug("called stop")
-	if g == nil {
-		l.Debug("Daemon is nil")
-		return
-	}
-	if g.Running == nil {
-		l.Debug("task is nil")
-		return
-	}
-
-}
-```
-
-命令：
-- <app> without arguments: start the daemon
-- <app> -s quit: stop the daemon
-- <app> -s restart: restart the daemon

go.mod

@@ -2,4 +2,4 @@ module git.pyer.club/kingecg/godaemon
 
 go 1.19
 
-require git.pyer.club/kingecg/gologger v1.0.4 // indirect
+require git.pyer.club/kingecg/gologger v1.0.1 // indirect

go.sum

@@ -1,4 +1,2 @@
 git.pyer.club/kingecg/gologger v1.0.1 h1:snCb0ePlfDUglX+CHwNzq5MRK5uNTnPUks1Dnapl/p8=
 git.pyer.club/kingecg/gologger v1.0.1/go.mod h1:SNSl2jRHPzIpHSzdKOoVG798rtYMjPDPFyxUrEgivkY=
-git.pyer.club/kingecg/gologger v1.0.4 h1:uSStqVw1H1hPTbRiIhRBOxHMw/tRWMZEvsspIKnNpGk=
-git.pyer.club/kingecg/gologger v1.0.4/go.mod h1:SNSl2jRHPzIpHSzdKOoVG798rtYMjPDPFyxUrEgivkY=

godaemon.go

@@ -22,11 +22,10 @@ const (
 )
 
 type GoDaemon struct {
-	pidFile     string
+	pidFile string
-	taskPidFile string
+	flag    *string
-	flag        *string
+	sigChan chan os.Signal
-	sigChan     chan os.Signal
+	state   string
-	state       string
 	*gologger.Logger
 	Running *exec.Cmd
 
@@ -42,14 +41,6 @@ func (g *GoDaemon) GetPid() int {
 	}
 	return pid
 }
-func (g *GoDaemon) GetTaskPid() int {
-	pids, ferr := os.ReadFile(g.taskPidFile)
-	pid, err := strconv.Atoi(string(pids))
-	if err != nil || ferr != nil {
-		return 0
-	}
-	return pid
-}
 
 func (g *GoDaemon) Start() {
 	if g.flag == nil {
@@ -102,12 +93,8 @@ func (g *GoDaemon) Start() {
 		}
 
 	} else {
-		waiter := make(chan os.Signal, 1)
+
 		g.StartFn(g)
-		g.Info("daemon task is started")
-		<-waiter
-		g.Info("daemon task will be stopped")
-		g.StopFn(g)
 	}
 }
 
@@ -119,7 +106,8 @@ func (g *GoDaemon) serveSignal() {
 		g.state = "restart"
 	}
 
-	g.Running.Process.Signal(syscall.SIGTERM)
+	g.Debug("Stop it")
+	g.StopFn(g)
 }
 
 func (g *GoDaemon) getDaemonProcess() *os.Process {
@@ -164,8 +152,6 @@ func (g *GoDaemon) startTask() *exec.Cmd {
 	} else {
 		cmd = exec.Command(execName)
 	}
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
 	cmd.Env = append(cmd.Env, daemon_env_key+"="+daemon_task)
 	cmd.Start()
 	return cmd
@@ -195,7 +181,6 @@ func NewGoDaemon(start, stop func(*GoDaemon)) *GoDaemon {
 		execName = strings.TrimSuffix(execName, filepath.Ext(execName))
 	}
 	godaemon.pidFile = execName + ".pid"
-	godaemon.taskPidFile = execName + ".task.pid"
 	godaemon.StartFn = start
 	godaemon.StopFn = stop
 	return godaemon

test/main.go

@@ -13,7 +13,10 @@ func main() {
 	gologger.Configure(gologger.LoggersConfig{
 		Appenders: map[string]gologger.LogAppenderConfig{
 			"flog": {
-				Type: "console",
+				Type: "file",
+				Options: map[string]interface{}{
+					"file": "flog.log",
+				},
 			},
 		},
 		Categories: map[string]gologger.LogConfig{
@@ -31,7 +34,7 @@ func start(g *godaemon.GoDaemon) {
 	l := gologger.GetLogger("task")
 	for {
 		time.Sleep(time.Second * 1)
-		l.Debug("task running:", g.GetPid())
+		l.Debug("task running")
 	}
 }
 
@@ -46,5 +49,8 @@ func stop(g *godaemon.GoDaemon) {
 		l.Debug("task is nil")
 		return
 	}
-
+	if g != nil && g.Running != nil {
+		l.Debug("To kill")
+		g.Running.Process.Kill()
+	}
 }

vendor/git.pyer.club/kingecg/gologger/.gitignore

@@ -15,4 +15,3 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
-log/

vendor/git.pyer.club/kingecg/gologger/console.go

@@ -15,11 +15,6 @@ const (
 type ConsoleAppender struct {
 }
 
-// Close implements LoggerAppender.
-func (c *ConsoleAppender) Close() {
-
-}
-
 func (c *ConsoleAppender) GetName() string {
 	return "console"
 }
@@ -40,9 +35,9 @@ func (c *ConsoleAppender) Append(logEvent LogEvent) {
 		fmt.Printf(TraceTemplate, logMsg)
 	}
 }
-func makeConsoleAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
+func makeConsoleAppender(appenderConfig LogAppenderConfig) LoggerAppender {
 	var appender LoggerAppender = &ConsoleAppender{}
-	return &appender
+	return appender
 }
 func init() {
 	RegistAppender("console", makeConsoleAppender)

vendor/git.pyer.club/kingecg/gologger/file.go

@@ -7,24 +7,14 @@ import (
 
 type FileAppender struct {
 	filePath string
-	lchan    chan LogEvent
 	file     *os.File
-	stopChan chan struct{}
-}
-
-// Close implements LoggerAppender.
-func (f *FileAppender) Close() {
-	//send stop signal
-	f.stopChan <- struct{}{}
 }
 
 func (f *FileAppender) GetName() string {
 	return "FileAppender:" + f.filePath
 }
 
-func (f *FileAppender) start() {
+func (f *FileAppender) Append(logEvent LogEvent) {
-	f.lchan = make(chan LogEvent, 10)
-	f.stopChan = make(chan struct{})
 	if f.file == nil || int(f.file.Fd()) == -1 {
 		dirName := filepath.Dir(f.filePath)
 		_, err := os.Stat(dirName)
@@ -34,26 +24,12 @@ func (f *FileAppender) start() {
 		f.file, _ = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 	}
 
-	go func() {
+	logMsg := format(logEvent)
-		defer f.file.Close()
+	f.file.WriteString(logMsg)
-		for {
-			select {
-			case <-f.stopChan:
-				return
-			case logEvent := <-f.lchan:
-				logMsg := format(logEvent)
-				f.file.WriteString(logMsg)
-			}
 
-		}
-	}()
-}
-func (f *FileAppender) Append(logEvent LogEvent) {
-
-	f.lchan <- logEvent
 }
 
-func makeFileAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
+func makeFileAppender(appenderConfig LogAppenderConfig) LoggerAppender {
 	var logfile interface{}
 	var ok bool
 	logfile, ok = appenderConfig.Options["file"]
@@ -63,10 +39,7 @@ func makeFileAppender(appenderConfig LogAppenderConfig) *LoggerAppender {
 	var ret LoggerAppender = &FileAppender{
 		filePath: logfile.(string),
 	}
-
+	return ret
-	ret.(*FileAppender).start()
-
-	return &ret
 }
 
 func init() {

vendor/git.pyer.club/kingecg/gologger/format.go

@@ -2,21 +2,13 @@ package gologger
 
 import (
 	"fmt"
-	"strings"
 )
 
 const logTemplate = "[%s] %s : %s - %s\n"
 
 func format(logEvent LogEvent) string {
 	data := logEvent.Ts.Format("2006-01-02 15:04:05")
-	msg := ""
+	msg := fmt.Sprint(logEvent.Data...)
-	firstMsg := logEvent.Data[0]
-	if isFormatString(firstMsg) {
-		msg = fmt.Sprintf(firstMsg.(string), logEvent.Data[1:]...)
-	} else {
-		msg = sprint(logEvent.Data)
-	}
-
 	ret := fmt.Sprintf(logTemplate, data, logEvent.Category, getLogLevelStr(logEvent.Level), msg)
 	return ret
 }
@@ -24,30 +16,8 @@ func format(logEvent LogEvent) string {
 func getLogLevelStr(level int) string {
 	for name, slevel := range logLevelMap {
 		if slevel == level {
-			return strings.ToUpper(name)
+			return name
 		}
 	}
 	return "Unknown"
 }
-
-func isFormatString(f interface{}) bool {
-	s, ok := f.(string)
-	if !ok {
-		return false
-	}
-	// 尝试使用空接口来格式化字符串
-	m := fmt.Sprintf(s, []interface{}{}...)
-	return strings.Index(m, "MISSING") != -1
-}
-
-func sprint(s []interface{}) string {
-	str := make([]any, len(s))
-	for i, v := range s {
-		if i > 0 {
-			str[i] = fmt.Sprintf(" %v", v)
-		} else {
-			str[i] = fmt.Sprintf("%v", v)
-		}
-	}
-	return fmt.Sprint(str...)
-}

vendor/git.pyer.club/kingecg/gologger/main.go

@@ -22,9 +22,9 @@ var logLevelMap map[string]int = map[string]int{
 	"debug": Debug,
 	"trace": Trace,
 }
-var loggerMap map[string]*Logger = map[string]*Logger{}
+var loggerMap map[string]Logger = map[string]Logger{}
-var appenderFactoryMap map[string]func(LogAppenderConfig) *LoggerAppender = map[string]func(LogAppenderConfig) *LoggerAppender{}
+var appenderFactoryMap map[string]func(LogAppenderConfig) LoggerAppender = map[string]func(LogAppenderConfig) LoggerAppender{}
-var appenders map[string]*LoggerAppender = map[string]*LoggerAppender{}
+var appenders map[string]LoggerAppender = map[string]LoggerAppender{}
 var loggerConfig LoggersConfig
 
 type LogAppenderConfig struct {
@@ -43,7 +43,7 @@ type LoggersConfig struct {
 type Logger struct {
 	category  string
 	level     int
-	appenders []*LoggerAppender
+	appenders []LoggerAppender
 }
 
 type LogEvent struct {
@@ -56,14 +56,13 @@ type LogEvent struct {
 type LoggerAppender interface {
 	GetName() string
 	Append(logEvent LogEvent)
-	Close()
 }
 
 var consoleAppender LoggerAppender = &ConsoleAppender{}
 var defaultLogger = &Logger{
 
 	level:     Error,
-	appenders: []*LoggerAppender{&consoleAppender},
+	appenders: []LoggerAppender{consoleAppender},
 }
 
 func (l *Logger) log(Level int, msg []interface{}) {
@@ -72,7 +71,7 @@ func (l *Logger) log(Level int, msg []interface{}) {
 		now := time.Now()
 		logEvent := LogEvent{l.category, now, Level, msg}
 		for _, appender := range l.appenders {
-			(*appender).Append(logEvent)
+			appender.Append(logEvent)
 		}
 		// l.Appender.Append(logEvent)
 		// fmt.Println(now.Format("2006-01-02 15:04:05"), " ", l.Name, ": ", msg)
@@ -98,7 +97,7 @@ func (l *Logger) Debug(msg ...interface{}) {
 func (l *Logger) Trace(msg ...interface{}) {
 	l.log(Trace, msg)
 }
-func GetLogger(name string) *Logger {
+func GetLogger(name string) Logger {
 	if logger, ok := loggerMap[name]; ok {
 		return logger
 	} else {
@@ -107,30 +106,29 @@ func GetLogger(name string) *Logger {
 			return makeLogger(name, logConfig)
 		}
 		if name == "default" {
-			return defaultLogger
+			return *defaultLogger
 		}
-		l := *GetLogger("default")
+		ret := GetLogger("default")
-		l.category = name
+		ret.category = name
-		loggerMap[name] = &l
+		return ret
-		return &l
 	}
 }
 
-func makeLogger(name string, config LogConfig) *Logger {
+func makeLogger(name string, config LogConfig) Logger {
 	logger := &Logger{category: name}
 	levelstr := strings.ToLower(config.Level)
 	logger.level = logLevelMap[levelstr]
 
 	if config.Appenders == nil || len(config.Appenders) == 0 {
-		logger.appenders = []*LoggerAppender{&consoleAppender}
+		logger.appenders = []LoggerAppender{consoleAppender}
 	} else {
-		logger.appenders = make([]*LoggerAppender, len(config.Appenders))
+		logger.appenders = make([]LoggerAppender, len(config.Appenders))
 		for i, appenderName := range config.Appenders {
 			logger.appenders[i] = appenders[appenderName]
 		}
 	}
-	loggerMap[name] = logger
+	loggerMap[name] = *logger
-	return logger
+	return *logger
 }
 func Configure(config LoggersConfig) {
 	loggerConfig = config
@@ -139,7 +137,7 @@ func Configure(config LoggersConfig) {
 		if ok {
 			appenders[name] = appenderFactory(appenderConfig)
 		} else {
-			appenders[name] = &consoleAppender
+			appenders[name] = &ConsoleAppender{}
 		}
 	}
 	for name, _ := range loggerConfig.Categories {
@@ -147,7 +145,7 @@ func Configure(config LoggersConfig) {
 	}
 }
 
-func RegistAppender(typeName string, appenderCreatCb func(LogAppenderConfig) *LoggerAppender) {
+func RegistAppender(typeName string, appenderCreatCb func(LogAppenderConfig) LoggerAppender) {
 
 	appenderFactoryMap[typeName] = appenderCreatCb
 }

vendor/modules.txt

@@ -1,3 +1,3 @@
-# git.pyer.club/kingecg/gologger v1.0.4
+# git.pyer.club/kingecg/gologger v1.0.1
 ## explicit; go 1.19
 git.pyer.club/kingecg/gologger