fix: 修改日志文件名为 log.txt,增加停止运行标志以避免主流程阻塞,并优化 DockerContainer 初始化逻辑以确保服务正常运行

This commit is contained in:
lixiangwuxian 2025-03-29 14:50:34 +08:00
parent d84506d440
commit b4e0ae21cb
3 changed files with 25 additions and 5 deletions

View File

@ -24,7 +24,7 @@ func init() {
}
// 设置日志输出到文件
logFile, err := os.OpenFile(filepath.Join("logs", "panic.log"), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
logFile, err := os.OpenFile(filepath.Join("logs", "log.txt"), os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
if err != nil {
log.Printf("打开日志文件失败: %v", err)
return
@ -33,6 +33,7 @@ func init() {
}
func main() {
var stopRun = false
// 创建 WebSocket 客户端
defer func() {
if err := recover(); err != nil {
@ -44,13 +45,16 @@ func main() {
// 写入日志文件
log.Print(errMsg)
}
stopRun = true
main()
}()
defer exec.DockerContainer.RemoveContainer()
defer sqlite3.CloseDB()
gin.SetMode(gin.ReleaseMode)
sqlite3.InitDB()
go func() {
const reconnectDelay = 5 * time.Second
for {
for !stopRun {
client, err := wsclient.NewWebSocketClient("ws", config.ConfigManager.GetConfig().Management.NapcatWsSrv, "")
if err != nil {
log.Printf("WebSocket连接失败: %v, %v 后重试", err, reconnectDelay)

View File

@ -5,6 +5,7 @@ import (
"context"
"fmt"
"io"
"log"
"time"
"github.com/docker/docker/api/types/container"
@ -16,9 +17,20 @@ import (
var DockerContainer *dockerContainer
func init() {
// Initialize DockerContainer with memory, CPU, and disk limits
DockerContainer, _ = NewDockerContainer(int64(2*1024*1024*1024), int64(1000000000))
DockerContainer.CreateAndStartContainer()
//检测docker服务是否已运行
go func() {
for {
// Initialize DockerContainer with memory, CPU, and disk limits
DockerContainer, err := NewDockerContainer(int64(2*1024*1024*1024), int64(1000000000))
if err != nil {
log.Println("NewDockerContainer failed", err)
time.Sleep(1 * time.Second)
continue
}
DockerContainer.CreateAndStartContainer()
return
}
}()
}
type dockerContainer struct {

View File

@ -30,3 +30,7 @@ func GetDB() *sqlx.DB {
func GetTran() (*sqlx.Tx, error) {
return db.Beginx()
}
func CloseDB() {
db.Close()
}