fix: 修改日志文件名为 log.txt,增加停止运行标志以避免主流程阻塞,并优化 DockerContainer 初始化逻辑以确保服务正常运行
This commit is contained in:
parent
d84506d440
commit
b4e0ae21cb
8
main.go
8
main.go
@ -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 {
|
if err != nil {
|
||||||
log.Printf("打开日志文件失败: %v", err)
|
log.Printf("打开日志文件失败: %v", err)
|
||||||
return
|
return
|
||||||
@ -33,6 +33,7 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
var stopRun = false
|
||||||
// 创建 WebSocket 客户端
|
// 创建 WebSocket 客户端
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := recover(); err != nil {
|
if err := recover(); err != nil {
|
||||||
@ -44,13 +45,16 @@ func main() {
|
|||||||
// 写入日志文件
|
// 写入日志文件
|
||||||
log.Print(errMsg)
|
log.Print(errMsg)
|
||||||
}
|
}
|
||||||
|
stopRun = true
|
||||||
|
main()
|
||||||
}()
|
}()
|
||||||
defer exec.DockerContainer.RemoveContainer()
|
defer exec.DockerContainer.RemoveContainer()
|
||||||
|
defer sqlite3.CloseDB()
|
||||||
gin.SetMode(gin.ReleaseMode)
|
gin.SetMode(gin.ReleaseMode)
|
||||||
sqlite3.InitDB()
|
sqlite3.InitDB()
|
||||||
go func() {
|
go func() {
|
||||||
const reconnectDelay = 5 * time.Second
|
const reconnectDelay = 5 * time.Second
|
||||||
for {
|
for !stopRun {
|
||||||
client, err := wsclient.NewWebSocketClient("ws", config.ConfigManager.GetConfig().Management.NapcatWsSrv, "")
|
client, err := wsclient.NewWebSocketClient("ws", config.ConfigManager.GetConfig().Management.NapcatWsSrv, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("WebSocket连接失败: %v, %v 后重试", err, reconnectDelay)
|
log.Printf("WebSocket连接失败: %v, %v 后重试", err, reconnectDelay)
|
||||||
|
@ -5,6 +5,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"log"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types/container"
|
"github.com/docker/docker/api/types/container"
|
||||||
@ -16,9 +17,20 @@ import (
|
|||||||
var DockerContainer *dockerContainer
|
var DockerContainer *dockerContainer
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
// Initialize DockerContainer with memory, CPU, and disk limits
|
//检测docker服务是否已运行
|
||||||
DockerContainer, _ = NewDockerContainer(int64(2*1024*1024*1024), int64(1000000000))
|
go func() {
|
||||||
DockerContainer.CreateAndStartContainer()
|
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 {
|
type dockerContainer struct {
|
||||||
|
@ -30,3 +30,7 @@ func GetDB() *sqlx.DB {
|
|||||||
func GetTran() (*sqlx.Tx, error) {
|
func GetTran() (*sqlx.Tx, error) {
|
||||||
return db.Beginx()
|
return db.Beginx()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func CloseDB() {
|
||||||
|
db.Close()
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user