From 467d125ef6ac819cc1e8bd1a8b5dcd00d491f624 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 30 十月 2019 09:13:39 +0800
Subject: [PATCH] bug fixed memvirt leak
---
main.go | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/main.go b/main.go
index 53572a8..263c91a 100644
--- a/main.go
+++ b/main.go
@@ -5,26 +5,50 @@
"flag"
_ "net/http/pprof"
"time"
- "fmt"
-
"taskpubsub/camera"
"taskpubsub/sdk"
"taskpubsub/tasktag"
"taskpubsub/util"
- "taskpubsub/logger"
-
+ "basic.com/valib/logger.git"
+ "github.com/spf13/viper"
)
var initchan = make(chan bool)
-
var useShm bool
+const (
+ configFilePath = "/opt/vasystem/config/"
+ configFileType = "yaml"
+ LOGBASEPATH = "/data/disk1/valog/taskpubsub.log"
+)
+
+var envirment = flag.String("e", "pro", "")
+
func init(){
- var logFile = "./taskpubsub.log"
- var logSaveDays = 15
-
+ viper.SetConfigType(configFileType)
+ viper.SetConfigName(*envirment)
+ viper.AddConfigPath(configFilePath)
+ viper.AddConfigPath("./")
+ err := viper.ReadInConfig()
+ if err != nil {
+ logger.Error("viper.ReadInConfig() Error")
+ //panic(err)
+ }
+
+ var logFile = LOGBASEPATH
+ if viper.GetString("LogBasePath") != "" {
+ logFile = viper.GetString("LogBasePath") + "/taskpubsub.log"
+ }
+
// 鏃ュ織鍒濆鍖�
- logger.Config(logFile, logger.InfoLevel)
+ if viper.IsSet("LogLevel") &&
+ viper.GetInt("LogLevel") >= logger.PanicLevel &&
+ viper.GetInt("LogLevel") <= logger.DebugLevel {
+ logger.Config(logFile, viper.GetInt("LogLevel"))
+ }else{
+ logger.Config(logFile, logger.DebugLevel)
+ }
+ var logSaveDays = 15
logger.SetSaveDays(logSaveDays)
logger.Info("loginit success !")
@@ -37,10 +61,8 @@
if useShm{
logger.Info("USE SHARE MEMORY")
- fmt.Println("USE SHARE MEMORY")
}else{
logger.Info("USE PIPE")
- fmt.Println("USE PIPE")
}
// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
go func() {
--
Gitblit v1.8.0