diff --git a/kafka/main.go b/kafka/main.go index a50ff9c..5a61eef 100644 --- a/kafka/main.go +++ b/kafka/main.go @@ -76,18 +76,9 @@ func comsumer(Game *config.Game) { log.Printf("comsumer db %s not exist \n", Game.Name) return } - // r := kafka.NewReader(kafka.ReaderConfig{ - // Brokers: []string{"kafka-server:9092", "kafka-server-2:9092"}, - // Topic: Game.Topic, - // Partition: Game.Partition, - // MinBytes: 10e3, // 10KB - // MaxBytes: 10e6, // 10MB - // }) + r := getKafkaReader("kafka-server:9092", Game.Topic, "log") defer r.Close() - // 设置读取超时时间 - offset := db.GetOffset(sqlDb) - r.SetOffset(offset) ctx := context.Background() log.Println("comsumer start ", Game.Name) ctx, cancel := context.WithCancel(ctx) diff --git a/pack.sh b/pack.sh index ce8098d..8435429 100644 --- a/pack.sh +++ b/pack.sh @@ -1,4 +1,4 @@ -cd /data/docs -python3 tool/cfg/tool_cfg_json.py +# cd /data/docs +# python3 tool/cfg/tool_cfg_json.py cd /codes/pet_home_server/src/server GOOS=linux GOARCH=amd64 /usr/local/go/bin/go build -o /data/devops/source/main main.go diff --git a/pack_local.sh b/pack_local.sh new file mode 100644 index 0000000..f083e58 --- /dev/null +++ b/pack_local.sh @@ -0,0 +1,4 @@ +# cd /data/docs +# python3 tool/cfg/tool_cfg_json.py +cd /data/pet_home_server/src/server +GOOS=linux GOARCH=amd64 /usr/local/go/bin/go build -o /data/devops/source/main main.go diff --git a/tool/main.go b/tool/main.go index 9077a6e..c846773 100644 --- a/tool/main.go +++ b/tool/main.go @@ -33,6 +33,7 @@ restart restart the server status get the server status install install the server uninstall uninstall the server +kill kill the server ` var cfg *ini.File var FuncMap map[string]func() error @@ -88,6 +89,7 @@ func main() { register("restart", restart) register("uninstall", uninstall) register("reload", reload) + register("kill", kill) funcName := os.Args[1] if f, ok := FuncMap[funcName]; ok { e := f() @@ -103,6 +105,36 @@ func register(name string, f func() error) { FuncMap[name] = f } +func kill() error { + if len(os.Args) < 4 { + log.Fatal("请输入要停止的服务类型和区号 kill [center|node] 区号") + } + NodeType := os.Args[2] + Zone := os.Args[3] + // 示例命令 + app_name := cfg.Section("app").Key("app_name").String() + processName := fmt.Sprintf("%s/zone/%s_%s_%s/server.json", app_path, app_name, NodeType, Zone) + // 示例进程名称 + + // 获取进程号 + pid, err := getPidByArgs(processName) + if err != nil { + log.Fatal(err) + } + + // 使用命令行命令 kill -9 杀死进程 + cmd := exec.Command("kill", "-9", strconv.Itoa(pid)) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + err = cmd.Run() + if err != nil { + log.Fatal(err) + } + + info("server %s_%s 已被 kill -9 杀死, 进程号:%d", NodeType, Zone, pid) + return nil +} + func install() error { // log.Println("install") if len(os.Args) < 4 { diff --git a/tool/pack_tool.sh b/tool/pack_tool.sh new file mode 100644 index 0000000..61c2855 --- /dev/null +++ b/tool/pack_tool.sh @@ -0,0 +1,3 @@ +# !/bin/bash +cd /data/devops/tool +GOOS=linux GOARCH=amd64 go build -o /data/devops/MergePet/tool/tool main.go