From 7db688079aa8ebf2ad495f0788517653c3984f52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 16 九月 2019 15:55:26 +0800
Subject: [PATCH] use one config with other proc
---
service/CamraUpdatesnashot.go | 2
service/FaceCompareService.go | 9 ++--
main.go | 40 ++++++++++----------
extend/config/config.go | 25 +++++-------
service/FDetectClient.go | 4 +
5 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/extend/config/config.go b/extend/config/config.go
index 450cc18..4e67b70 100644
--- a/extend/config/config.go
+++ b/extend/config/config.go
@@ -10,6 +10,7 @@
JwtSecret string `mapstructure: "jwtSecret"`
JwtExpire string `mapstructure: "jwtExpire"`
Url string `mapstructure: "url"`
+ AnalyServerId string `mapstructure: "analyServerId"`
ImageUrl string `mapstructure: "imageUrl"`
PublicDomain string `mapstructure: "publicDomain"`
NetworkAdapter string `mapstructure: "networkAdapter"`
@@ -25,15 +26,6 @@
var WeedFs = &weedfs{}
-type redis struct {
- Host string `mapstructure:"host"`
- Port int `mapstructure:"port"`
- Password string `mapstructure:"password`
- DBNum int `mapstructure:"db"`
-}
-
-var RedisConf = &redis{}
-
type database struct {
Drive string `mapstructure:"drive"`
Name string `mapstructure:"name"`
@@ -44,6 +36,7 @@
type esinfo struct {
Masterip string `mapstructure:"masterip"`
Httpport string `mapstructure:"httpport"`
+ Shards string `mapstructure:"shards"`
EsIndex esindexlist `mapstructure:"index"`
}
@@ -70,15 +63,18 @@
var DBconf = &database{}
type facedetect struct {
- Url string `mapstructure:"url"`
+ Ip string `mapstructure:"Ip"`
+ Port int `mapstructure:"port"`
}
type dbpersoncompare struct {
- Url string `mapstructure:"url"`
+ Ip string `mapstructure:"ip"`
+ Port int `mapstructure:"port"`
}
type espersoncompare struct {
- Url []string `mapstructure:"url"`
+ Port int `mapstructure:"port"`
+ Ips []string `mapstructure:"ips"`
}
var DbPersonCompInfo = &dbpersoncompare{}
@@ -93,15 +89,14 @@
var err error
viper.SetConfigType("yaml")
viper.SetConfigName(env)
- viper.AddConfigPath("../config/")
- viper.AddConfigPath("config/")
+ viper.AddConfigPath("/opt/vasystem/config/")
+ viper.AddConfigPath("")
err = viper.ReadInConfig()
if err != nil {
log.Fatal("error on parsing configuration file")
}
viper.UnmarshalKey("es", EsInfo)
viper.UnmarshalKey("server", Server)
- viper.UnmarshalKey("redis", RedisConf)
viper.UnmarshalKey("database", DBconf)
viper.UnmarshalKey("weedfs", WeedFs)
viper.UnmarshalKey("sopath",SoPath)
diff --git a/main.go b/main.go
index ab19bd5..342bcbc 100644
--- a/main.go
+++ b/main.go
@@ -2,14 +2,13 @@
import (
"basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"flag"
"github.com/golang/glog"
- "github.com/robfig/cron"
+ "github.com/spf13/viper"
"strconv"
"webserver/extend/config"
- "basic.com/valib/logger.git"
"webserver/router"
- "webserver/service"
)
var envirment = flag.String("e", "dev", "")
@@ -17,13 +16,6 @@
var dbPort = flag.String("dbPort", "8001", "default dbPort=8001")
func init() {
- var logFile = "./logger/webserver.log"
- var logSaveDays = 15
-
- // 鏃ュ織鍒濆鍖�
- logger.Config(logFile, logger.DebugLevel)
- logger.SetSaveDays(logSaveDays)
- logger.Info("loginit success !")
flag.Parse()
//service.InitService()
@@ -31,9 +23,25 @@
if err != nil {
p = 8001
}
- //*dbIp = "192.168.1.123"
- //*dbIp = "192.168.1.182"
dbapi.Init(*dbIp, p)
+
+ 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 !")
flag.Usage = func() {
glog.Exit("flag parse usage !")
@@ -44,14 +52,6 @@
config.Init(*envirment)
}
func main() {
- c := cron.New()
- c.AddFunc("@ daily", func() {
- res := service.InitEnableStatus()
- logger.Debug(res)
- })
- c.Start()
r := router.NewRouter()
r.Run("0.0.0.0:8000")
-
- //defer new(gorun.SimpleFaceDetect).FaceDetactClose()
}
diff --git a/service/CamraUpdatesnashot.go b/service/CamraUpdatesnashot.go
index 0ca5c58..d71c8e8 100644
--- a/service/CamraUpdatesnashot.go
+++ b/service/CamraUpdatesnashot.go
@@ -143,7 +143,7 @@
if camera.Type == 1{//鍥芥爣鎽勫儚鏈�
m = capture.GB28181
}
- b,err := capture.Capture("./runtime/libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
+ b,err := capture.Capture("libcffmpeg.so",m,camera.Rtsp,capture.JPEGFileExt,1280,720,10)
if err == nil{
var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
weedFilePath, err := WeedFSClient.UploadFile(weedfsUri, camera.Name+".jpg", b)
diff --git a/service/FDetectClient.go b/service/FDetectClient.go
index dd40813..b020870 100644
--- a/service/FDetectClient.go
+++ b/service/FDetectClient.go
@@ -4,6 +4,7 @@
"basic.com/pubsub/protomsg.git"
"context"
"errors"
+ "strconv"
"time"
"webserver/extend/config"
"basic.com/valib/logger.git"
@@ -12,7 +13,8 @@
)
func DoFDetectWithRpc(fdr *protomsg.FaceDetectRequest,t time.Duration) ([]*protomsg.ResultFaceDetect,error) {
- conn,err := grpc.Dial(config.FaceDetectSet.Url, grpc.WithInsecure())
+ fdUrl:=config.FaceDetectSet.Ip + ":" + strconv.Itoa(config.FaceDetectSet.Port)
+ conn,err := grpc.Dial(fdUrl, grpc.WithInsecure())
if err !=nil {
logger.Debug("grpc dial err:",err)
}
diff --git a/service/FaceCompareService.go b/service/FaceCompareService.go
index 67e8eb8..24aabde 100644
--- a/service/FaceCompareService.go
+++ b/service/FaceCompareService.go
@@ -8,6 +8,7 @@
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
+ "strconv"
"sync"
"webserver/extend/config"
"basic.com/valib/logger.git"
@@ -66,13 +67,13 @@
func (sv *FaceCompareService) CompareVideoPersons() *CompareList{
sv.CompareArgs.TableIds = []string { CaptureTable }
b, err := proto.Marshal(&sv.CompareArgs)
- esCompServerList := config.EsCompServerInfo.Url
+ esCompServerList := config.EsCompServerInfo.Ips
logger.Debug("compServerList:", esCompServerList)
//1.鍚戝悇涓狤s compare杩涚▼鍙戣捣璇锋眰鎷垮埌姣斿缁撴灉
var resultList CompareList
for _,str :=range esCompServerList{
- reqUrl := "tcp://"+str
+ reqUrl := "tcp://"+str + ":"+strconv.Itoa(config.EsCompServerInfo.Port)
resultB := doCompareRequest(reqUrl,b)
if resultB == nil || len(*resultB) ==0 {
continue
@@ -98,12 +99,12 @@
//姣斿搴曞簱
func (sv *FaceCompareService) CompareDbPersons() *CompareList{
b, err := proto.Marshal(&sv.CompareArgs)
- dbPersonCompServerUrl := config.DbPersonCompInfo.Url
+ dbPersonCompServerUrl := config.DbPersonCompInfo.Ip
logger.Debug("comp Server url:", dbPersonCompServerUrl)
var resultList CompareList
- reqUrl := "tcp://"+dbPersonCompServerUrl
+ reqUrl := "tcp://"+dbPersonCompServerUrl+":"+strconv.Itoa(config.DbPersonCompInfo.Port)
resultB := doCompareRequest(reqUrl,b)
if resultB == nil || len(*resultB) ==0 {
return nil
--
Gitblit v1.8.0