可配置日志输出到控制台和日志文件

Author: IoTServ

.gitignore

@@ -1,2 +1,3 @@
 *.exe
-/dist
+/dist
+/*.log

README.md

@@ -19,6 +19,9 @@
 
 ```yaml
 my_public_ip_or_domian: "" #你运行本软件的服务器的域名或者ip地址，用来使用命令生成token时有用
+logconfig:
+  enablestdout: true #是否输出日志到控制台
+  logfilepath: "./mylog.log" #配置日志输出文件的位置，空则不输出到文件
 common:
   bind_addr: 0.0.0.0 #服务器监听的IP地址，默认监听所有
   tcp_port: 34320 #服务器使用的tcp端口

config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/OpenIoTHub/utils/models"
 	"gopkg.in/yaml.v2"
+	"io"
 	"io/ioutil"
 	"log"
 	"os"
@@ -24,6 +25,21 @@ func LoadConfig() (err error) {
 	}
 	log.Println("使用配置文件：", DefaultConfigFilePath)
 	ConfigMode, err = GetConfig(DefaultConfigFilePath)
+	//解析日志配置
+	writers := []io.Writer{}
+	if ConfigMode.LogConfig != nil && ConfigMode.LogConfig.EnableStdout {
+		writers = append(writers, os.Stdout)
+	}
+	if ConfigMode.LogConfig != nil && ConfigMode.LogConfig.LogFilePath != "" {
+		f, err := os.OpenFile(ConfigMode.LogConfig.LogFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+		if err != nil {
+			log.Fatal(err)
+		}
+		writers = append(writers, f)
+	}
+	fileAndStdoutWriter := io.MultiWriter(writers...)
+	log.SetOutput(fileAndStdoutWriter)
+	//
 	if err != nil {
 		return
 	}
@@ -32,6 +48,10 @@ func LoadConfig() (err error) {
 
 func InitConfigFile() {
 	var err error
+	ConfigMode.LogConfig = &models.LogConfig{
+		EnableStdout: true,
+		LogFilePath:  "",
+	}
 	ConfigMode.Common.BindAddr = DefaultBindAddr
 	ConfigMode.Common.KcpPort = DefaultKcpPort
 	ConfigMode.Common.TcpPort = DefaultTcpPort

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/OpenIoTHub/server-grpc-api v1.0.4
-	github.com/OpenIoTHub/utils v0.0.60
+	github.com/OpenIoTHub/utils v0.0.61
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible
@@ -19,7 +19,7 @@ require (
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
 	github.com/tjfoc/gmsm v1.3.2 // indirect
-	github.com/urfave/cli/v2 v2.2.0
+	github.com/urfave/cli/v2 v2.3.0
 	github.com/xtaci/kcp-go v5.4.20+incompatible
 	github.com/xtaci/kcp-go/v5 v5.5.14 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9

go.sum

@@ -3,10 +3,14 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OpenIoTHub/getip v0.1.0 h1:W8iB+PcDz15jJHJTxMZmyXVAc8TRjwJTZ1+JsxCYVc4=
 github.com/OpenIoTHub/getip v0.1.0/go.mod h1:MO10UjKzR2d8p2ajplZu//NsvQ0GMiL7pllh1LEnKIM=
+github.com/OpenIoTHub/getip v0.1.2 h1:xpKf37ble1H6N02XgpAGLxG5cVcp8vIIs5XaUYNi+g0=
+github.com/OpenIoTHub/getip v0.1.2/go.mod h1:yEnLPtVS4JBoEU720mO6FmxLwCICKLyOcOEKRD6w0cY=
 github.com/OpenIoTHub/server-grpc-api v1.0.4 h1:dVqKqdhV6VaQIZipOHqxJEpt7NfU8QvPTaDXVJd1Vog=
 github.com/OpenIoTHub/server-grpc-api v1.0.4/go.mod h1:4Tvt1MoMNqIBcVSweRZOXuqOj5JWw1HPNxd9vZv4oAI=
 github.com/OpenIoTHub/utils v0.0.60 h1:6yKUdBp0O49IzV1fH+p1/ah1mgqbmF+DLSFOSFlYeWA=
 github.com/OpenIoTHub/utils v0.0.60/go.mod h1:y1u/SS0CAgsOI95RnrI6nxMFcXNVAF6NF6sbNDqNDkQ=
+github.com/OpenIoTHub/utils v0.0.61 h1:CSe8mcGq8NX8xBtTzvjkcpczrFxUrlByUE5AWnnp+zw=
+github.com/OpenIoTHub/utils v0.0.61/go.mod h1:i0gwARUWZV6mtb5uREHNGzlPOjQxU282ztsJM9dQjaA=
 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
@@ -113,6 +117,8 @@ github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM=
 github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
 github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
 github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/xtaci/kcp-go v5.4.20+incompatible h1:TN1uey3Raw0sTz0Fg8GkfM0uH3YwzhnZWQ1bABv5xAg=
 github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
 github.com/xtaci/kcp-go/v5 v5.5.12 h1:iALGyvti/oBbl1TbVoUpHEUHCorDEb3tEKl1CPY3KXM=
@@ -225,6 +231,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

server-go.yaml

@@ -1,4 +1,7 @@
 my_public_ip_or_domian: "" #你运行本软件的服务器的域名或者ip地址，用来使用命令生成token时有用
+logconfig:
+  enablestdout: true #是否输出日志到控制台
+  logfilepath: "./mylog.log" #配置日志输出文件的位置，空则不输出到文件
 common:
   bind_addr: 0.0.0.0 #服务器监听的IP地址，默认监听所有
   tcp_port: 34320 #服务器使用的tcp端口