marge: 合并11.2版本

captrace/config/config.go

@@ -110,15 +110,17 @@ const defaultConfigFile = "./etc/capconf.yaml"
 
 func init() {
 	cfile := flag.String("c", defaultConfigFile, "config file")
-	pv := flag.Bool("version", false, "print version")
-	ph := flag.Bool("help", false, "print help")
+	pv := flag.Bool("v", false, "print version")
+	pversion := flag.Bool("version", false, "print version")
+	ph := flag.Bool("h", false, "print help")
+	phelp := flag.Bool("help", false, "print help")
 
 	flag.Parse()
-	if *pv {
+	if *pv || *pversion {
 		fmt.Printf("OMC captrace version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer)
 		os.Exit(0)
 	}
-	if *ph {
+	if *ph || *phelp {
 		flag.Usage()
 		os.Exit(0)
 	}

captrace/etc/capconf.yaml

@@ -2,7 +2,7 @@
 # level: /trace/debug/info/error/warn/error/fatal, default: debug
 # duration: saved days, default is 30 days
 logger:
-  file: d:/local.git/be.ems/captrace/log/captrace.log
+  file: d:/omc.git/be.ems/captrace/log/captrace.log
   level: trace
   duration: 24
   count: 10 

captrace/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2408.1
+VERSION = 2.2411.2
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build