kopia lustrzana https://github.com/cyoung/stratux
Cleanup.
Christopher Young
rodzic
6b9a750ddc
commit
495fb46fee
|
|
@ -2,10 +2,10 @@ package main
|
|||
|
||||
import (
|
||||
"bufio"
|
||||
"flag"
|
||||
"compress/gzip"
|
||||
"encoding/hex"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
|
|
@ -76,17 +76,17 @@ var Crc16Table [256]uint16
|
|||
// Current AHRS, pressure altitude, etc.
|
||||
var mySituation SituationData
|
||||
|
||||
type WriteCloser interface {
|
||||
io.Writer
|
||||
io.Closer
|
||||
}
|
||||
|
||||
// File handles for replay logging.
|
||||
var uatReplayWriter *os.File
|
||||
var uatReplayWriterGzip *gzip.Writer
|
||||
var esReplayWriter *os.File
|
||||
var esReplayWriterGzip *gzip.Writer
|
||||
var gpsReplayWriter *os.File
|
||||
var gpsReplayWriterGzip *gzip.Writer
|
||||
var ahrsReplayWriter *os.File
|
||||
var ahrsReplayWriterGzip *gzip.Writer
|
||||
var dump1090ReplayWriter *os.File
|
||||
var dump1090ReplayWriterGzip *gzip.Writer
|
||||
var uatReplayWriter WriteCloser
|
||||
var esReplayWriter WriteCloser
|
||||
var gpsReplayWriter WriteCloser
|
||||
var ahrsReplayWriter WriteCloser
|
||||
var dump1090ReplayWriter WriteCloser
|
||||
|
||||
var developerMode bool
|
||||
|
||||
|
|
@ -115,7 +115,6 @@ type ADSBTower struct {
|
|||
Messages_total uint64
|
||||
}
|
||||
|
||||
|
||||
var ADSBTowers map[string]ADSBTower // Running list of all towers seen. (lat,lng) -> ADSBTower
|
||||
|
||||
func constructFilenames() {
|
||||
|
|
@ -562,9 +561,8 @@ func replayLog(msg string, msgclass int) {
|
|||
if len(msg) == 0 { // Blank message.
|
||||
return
|
||||
}
|
||||
var fp *os.File
|
||||
var wt *gzip.Writer
|
||||
if developerMode == true {
|
||||
var fp WriteCloser
|
||||
|
||||
switch msgclass {
|
||||
case MSGCLASS_UAT:
|
||||
fp = uatReplayWriter
|
||||
|
|
@ -577,28 +575,11 @@ func replayLog(msg string, msgclass int) {
|
|||
case MSGCLASS_DUMP1090:
|
||||
fp = dump1090ReplayWriter
|
||||
}
|
||||
|
||||
if fp != nil {
|
||||
s := makeReplayLogEntry(msg)
|
||||
fp.Write([]byte(s))
|
||||
}
|
||||
} else {
|
||||
switch msgclass {
|
||||
case MSGCLASS_UAT:
|
||||
wt = uatReplayWriterGzip
|
||||
case MSGCLASS_ES:
|
||||
wt = esReplayWriterGzip
|
||||
case MSGCLASS_GPS:
|
||||
wt = gpsReplayWriterGzip
|
||||
case MSGCLASS_AHRS:
|
||||
wt = ahrsReplayWriterGzip
|
||||
case MSGCLASS_DUMP1090:
|
||||
wt = dump1090ReplayWriterGzip
|
||||
}
|
||||
if wt != nil {
|
||||
s := makeReplayLogEntry(msg)
|
||||
wt.Write([]byte(s))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type WeatherMessage struct {
|
||||
|
|
@ -914,31 +895,26 @@ func replayMark(active bool) {
|
|||
|
||||
}
|
||||
|
||||
func openReplay(fn string) (*os.File, error) {
|
||||
func openReplay(fn string, compressed bool) (WriteCloser, error) {
|
||||
fp, err := os.OpenFile(fn, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("Failed to open log file '%s': %s\n", fn, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var ret WriteCloser
|
||||
if compressed {
|
||||
ret = gzip.NewWriter(fp) //FIXME: Close() on the gzip.Writer will not close the underlying file.
|
||||
} else {
|
||||
timeFmt := "Mon Jan 2 15:04:05 -0700 MST 2006"
|
||||
fmt.Fprintf(fp, "START,%s,%s\n", timeStarted.Format(timeFmt), time.Now().Format(timeFmt)) // Start time marker.
|
||||
}
|
||||
return fp, err
|
||||
ret = fp
|
||||
}
|
||||
|
||||
func openReplayGzip(fn string) (*gzip.Writer, error) {
|
||||
fp, err := os.OpenFile(fn, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
|
||||
|
||||
if err != nil {
|
||||
log.Printf("Failed to open log file '%s': %s\n", fn, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
gzw := gzip.NewWriter(fp) //FIXME: Close() on the gzip.Writer will not close the underlying file.
|
||||
timeFmt := "Mon Jan 2 15:04:05 -0700 MST 2006"
|
||||
s := fmt.Sprintf("START,%s,%s\n", timeStarted.Format(timeFmt), time.Now().Format(timeFmt)) // Start time marker.
|
||||
gzw.Write([]byte(s))
|
||||
return gzw, err
|
||||
|
||||
ret.Write([]byte(s))
|
||||
return ret, err
|
||||
}
|
||||
|
||||
func printStats() {
|
||||
|
|
@ -999,8 +975,6 @@ func uatReplay(f *os.File, replaySpeed uint64) {
|
|||
uatReplayDone = true
|
||||
}
|
||||
|
||||
|
||||
|
||||
func openReplayFile(fn string) *os.File {
|
||||
f, err := os.Open(fn)
|
||||
if err != nil {
|
||||
|
|
@ -1011,7 +985,6 @@ func openReplayFile(fn string) *os.File {
|
|||
return f
|
||||
}
|
||||
|
||||
|
||||
func main() {
|
||||
|
||||
// replayESFilename := flag.String("eslog", "none", "ES Log filename")
|
||||
|
|
@ -1063,78 +1036,41 @@ func main() {
|
|||
|
||||
// Set up the replay logs. Keep these files open in any case, even if replay logging is disabled.
|
||||
|
||||
// UAT replay log.
|
||||
if developerMode == true {
|
||||
if uatwt, err := openReplay(uatReplayLog); err != nil {
|
||||
if uatwt, err := openReplay(uatReplayLog, !developerMode); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
uatReplayWriter = uatwt
|
||||
defer uatReplayWriter.Close()
|
||||
}
|
||||
// 1090ES replay log.
|
||||
if eswt, err := openReplay(esReplayLog); err != nil {
|
||||
if eswt, err := openReplay(esReplayLog, !developerMode); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
esReplayWriter = eswt
|
||||
defer esReplayWriter.Close()
|
||||
}
|
||||
// GPS replay log.
|
||||
if gpswt, err := openReplay(gpsReplayLog); err != nil {
|
||||
if gpswt, err := openReplay(gpsReplayLog, !developerMode); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
gpsReplayWriter = gpswt
|
||||
defer gpsReplayWriter.Close()
|
||||
}
|
||||
// AHRS replay log.
|
||||
if ahrswt, err := openReplay(ahrsReplayLog); err != nil {
|
||||
if ahrswt, err := openReplay(ahrsReplayLog, !developerMode); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
ahrsReplayWriter = ahrswt
|
||||
defer ahrsReplayWriter.Close()
|
||||
}
|
||||
// Dump1090 replay log.
|
||||
if dump1090wt, err := openReplay(dump1090ReplayLog); err != nil {
|
||||
if dump1090wt, err := openReplay(dump1090ReplayLog, !developerMode); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
dump1090ReplayWriter = dump1090wt
|
||||
defer dump1090ReplayWriter.Close()
|
||||
}
|
||||
} else {
|
||||
if uatwt, err := openReplayGzip(uatReplayLog); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
uatReplayWriterGzip = uatwt
|
||||
defer uatReplayWriterGzip.Close()
|
||||
}
|
||||
// 1090ES replay log.
|
||||
if eswt, err := openReplayGzip(esReplayLog); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
esReplayWriterGzip = eswt
|
||||
defer esReplayWriterGzip.Close()
|
||||
}
|
||||
// GPS replay log.
|
||||
if gpswt, err := openReplayGzip(gpsReplayLog); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
gpsReplayWriterGzip = gpswt
|
||||
defer gpsReplayWriterGzip.Close()
|
||||
}
|
||||
// AHRS replay log.
|
||||
if ahrswt, err := openReplayGzip(ahrsReplayLog); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
ahrsReplayWriterGzip = ahrswt
|
||||
defer ahrsReplayWriterGzip.Close()
|
||||
}
|
||||
// Dump1090 replay log.
|
||||
if dump1090wt, err := openReplayGzip(dump1090ReplayLog); err != nil {
|
||||
globalSettings.ReplayLog = false
|
||||
} else {
|
||||
dump1090ReplayWriterGzip = dump1090wt
|
||||
defer dump1090ReplayWriterGzip.Close()
|
||||
}
|
||||
}
|
||||
|
||||
// Mark the files (whether we're logging or not).
|
||||
replayMark(globalSettings.ReplayLog)
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue