mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure only one logger is ever created

This commit is contained in:
richardsonjack 2018-05-30 12:45:37 +09:30
parent 90288f546a
commit 369beab55c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RevidCLI.go
View File

@ -241,12 +241,12 @@ func main() {
config.Timeout = *configFlags[timeoutPtr] config.Timeout = *configFlags[timeoutPtr]
config.IntraRefreshPeriod = *configFlags[intraRefreshPeriodPtr] config.IntraRefreshPeriod = *configFlags[intraRefreshPeriodPtr]
// Also give the config a logger object
config.Logger = smartlogger.New(loggerVerbosity, smartlogger.File, "/var/log/netsender/")
//init netsender //init netsender
if *netSenderFlagPtr { if *netSenderFlagPtr {
netsenderInit() netsenderInit()
} else {
// Also give the config a logger object
config.Logger = smartlogger.New(loggerVerbosity, smartlogger.File, "/var/log/netsender/")
} }
time.Sleep(time.Duration(prepTime) * time.Second) time.Sleep(time.Duration(prepTime) * time.Second)
@ -257,14 +257,14 @@ func main() {
for *netSenderFlagPtr { for *netSenderFlagPtr {
varsChanged, err := netSend() varsChanged, err := netSend()
if err != nil { if err != nil {
config.Logger.Log("revidCLI","Error", err.Error()) config.Logger.Log("revidCLI", "Error", err.Error())
time.Sleep(time.Duration(netSendRetryTime) * time.Second) time.Sleep(time.Duration(netSendRetryTime) * time.Second)
continue continue
} }
if varsChanged { if varsChanged {
if vars["mode"] == "Paused" { if vars["mode"] == "Paused" {
if !paused { if !paused {
config.Logger.Log("revidCLI","Info", "Pausing revid") config.Logger.Log("revidCLI", "Info", "Pausing revid")
stopRevid() stopRevid()
paused = true paused = true
} }
@ -477,7 +477,7 @@ func createRevidInstance() {
// If the config does have a logger, use it to output error, otherwise // If the config does have a logger, use it to output error, otherwise
// just output to std output // just output to std output
if config.Logger != nil { if config.Logger != nil {
config.Logger.Log("revidCLI","FATAL ERROR", err.Error()) config.Logger.Log("revidCLI", "FATAL ERROR", err.Error())
} else { } else {
fmt.Printf("FATAL ERROR: %v", err.Error()) fmt.Printf("FATAL ERROR: %v", err.Error())
} }