From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
main.go | 72 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/main.go b/main.go
index 0f66a94..528706c 100644
--- a/main.go
+++ b/main.go
@@ -2,26 +2,68 @@
import (
"flag"
- "github.com/golang/glog"
+ "strconv"
+ "webserver/cache"
"webserver/extend/config"
- "webserver/models"
+ "webserver/extend/sys"
"webserver/router"
+
+ "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
+ "github.com/spf13/viper"
)
-func main() {
+var envirment = flag.String("e", "pro", "")
+var dbIp = flag.String("dbIp", "127.0.0.1", "default dbIp=127.0.0.1")
+var dbPort = flag.String("dbPort", "8001", "default dbPort=8001")
+var surveyPort = flag.Int("surveyPort", 40007, "survey port") //蹇冭烦
+var pubPort = flag.Int("pubPort", 50007, "pubsub port") //鏁版嵁鏇存柊
+var initchan = make(chan bool)
- envirment := flag.String("e", "dev", "")
- flag.Usage = func() {
- glog.Exit("flag parse usage !")
- }
+func init() {
flag.Parse()
- flag.Lookup("alsologtostderr").Value.Set("true")
- flag.Lookup("log_dir").Value.Set("./log")
- config.Init(*envirment)
- models.Init()
- r := router.NewRouter()
- r.Run("0.0.0.0:8000")
- defer models.CloseDB()
- //defer new(gorun.SimpleFaceDetect).FaceDetactClose()
+ p, err := strconv.Atoi(*dbPort)
+ if err != nil {
+ p = 8001
+ }
+ dbapi.Init(*dbIp, p)
+ config.Init(*envirment)
+
+ var logFile = "./logger/"
+ if viper.GetString("LogBasePath") != "" {
+ logFile = viper.GetString("LogBasePath")
+ }
+ logFile = logFile + "/webserver.log"
+ var logSaveDays = 15
+
+ // 鏃ュ織鍒濆鍖�
+ 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)
+ }
+ logger.SetSaveDays(logSaveDays)
+ logger.Info("loginit success !")
+}
+
+// @title Swagger API
+// @version 2.0
+// @description analysis webserver
+// @securityDefinitions.apikey ApiKeyAuth
+// @in header
+// @name Authorization
+// @BasePath /
+func main() {
+ flag.Parse()
+ go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
+ logger.Debug("heartBeat with db done!", <-initchan)
+
+ // 缁熻绯荤粺杩愯鐘舵��
+ go sys.GatherStat()
+
+ r := router.NewRouter()
+ r.Run("0.0.0.0:7100")
}
--
Gitblit v1.8.0