Revert "pipe dump1090's out to the logger"

This reverts commit d66047c4ea.
pull/112/head
Joseph Poirier 2015-11-12 20:15:01 -06:00
rodzic d66047c4ea
commit 8955599246
2 zmienionych plików z 3 dodań i 11 usunięć

Wyświetl plik

@ -832,13 +832,12 @@ func main() {
runtime.GOMAXPROCS(runtime.NumCPU()) // redundant with Go v1.5+ compiler
// Duplicate log.* output to debugLog.
var mfp io.Writer
fp, err := os.OpenFile(debugLog, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
if err != nil {
log.Printf("Failed to open '%s': %s\n", debugLog, err.Error())
} else {
defer fp.Close()
mfp = io.MultiWriter(fp, os.Stdout)
mfp := io.MultiWriter(fp, os.Stdout)
log.SetOutput(mfp)
}
@ -848,7 +847,7 @@ func main() {
MsgLog = make([]msg, 0)
crcInit() // Initialize CRC16 table.
sdrInit(mfp)
sdrInit()
initTraffic()
globalStatus.Version = stratuxVersion

Wyświetl plik

@ -1,7 +1,6 @@
package main
import (
"io"
"log"
"os/exec"
"strconv"
@ -24,7 +23,6 @@ type ES struct {
indexID int
}
var mfp io.Writer
var UATDev *UAT
var ESDev *ES
@ -40,10 +38,6 @@ func (e *ES) read() {
defer es_wg.Done()
log.Println("Entered ES read() ...")
cmd := exec.Command("/usr/bin/dump1090", "--net", "--device-index", strconv.Itoa(e.indexID))
if mfp != nil {
cmd.Stdout = mfp
cmd.Stderr = cmd.Stdout
}
err := cmd.Start()
if err != nil {
log.Printf("Error executing /usr/bin/dump1090: %s\n", err.Error())
@ -388,8 +382,7 @@ func sdrWatcher() {
}
}
func sdrInit(m io.Writer) {
mfp = m
func sdrInit() {
go sdrWatcher()
go uatReader()
godump978.Dump978Init()