Added developer mode command line switch which allows uncompressed log files

pull/144/head
Jim Jacobsen 2015-12-14 01:04:40 +00:00
rodzic 191752b3e8
commit bb8f0254e1
1 zmienionych plików z 147 dodań i 69 usunięć

Wyświetl plik

@ -3,6 +3,7 @@ package main
import (
"bufio"
"flag"
"compress/gzip"
"encoding/hex"
"encoding/json"
"fmt"
@ -77,10 +78,17 @@ var mySituation SituationData
// 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 developerMode bool
type msg struct {
MessageClass uint
@ -111,11 +119,6 @@ type ADSBTower struct {
var ADSBTowers map[string]ADSBTower // Running list of all towers seen. (lat,lng) -> ADSBTower
func constructFilenames() {
// uatReplayLog = "/var/log/stratux-uat.log"
// esReplayLog = "/var/log/stratux-es.log"
// gpsReplayLog = "/var/log/stratux-gps.log"
// ahrsReplayLog = "/var/log/stratux-ahrs.log"
// dump1090ReplayLog = "/var/log/stratux-dump1090.log"
var fileIndexNumber uint
// First, create the log file directory if it does not exist
@ -143,11 +146,19 @@ func constructFilenames() {
}
fo.Sync()
fo.Close()
uatReplayLog = fmt.Sprintf("%s/%04d-uat.log",logDirectory,fileIndexNumber)
esReplayLog = fmt.Sprintf("%s/%04d-es.log",logDirectory,fileIndexNumber)
gpsReplayLog = fmt.Sprintf("%s/%04d-gps.log",logDirectory,fileIndexNumber)
ahrsReplayLog = fmt.Sprintf("%s/%04d-ahrs.log",logDirectory,fileIndexNumber)
dump1090ReplayLog = fmt.Sprintf("%s/%04d-dump1090.log",logDirectory,fileIndexNumber)
if developerMode == true {
uatReplayLog = fmt.Sprintf("%s/%04d-uat.log",logDirectory,fileIndexNumber)
esReplayLog = fmt.Sprintf("%s/%04d-es.log",logDirectory,fileIndexNumber)
gpsReplayLog = fmt.Sprintf("%s/%04d-gps.log",logDirectory,fileIndexNumber)
ahrsReplayLog = fmt.Sprintf("%s/%04d-ahrs.log",logDirectory,fileIndexNumber)
dump1090ReplayLog = fmt.Sprintf("%s/%04d-dump1090.log",logDirectory,fileIndexNumber)
} else {
uatReplayLog = fmt.Sprintf("%s/%04d-uat.log.gz",logDirectory,fileIndexNumber)
esReplayLog = fmt.Sprintf("%s/%04d-es.log.gz",logDirectory,fileIndexNumber)
gpsReplayLog = fmt.Sprintf("%s/%04d-gps.log.gz",logDirectory,fileIndexNumber)
ahrsReplayLog = fmt.Sprintf("%s/%04d-ahrs.log.gz",logDirectory,fileIndexNumber)
dump1090ReplayLog = fmt.Sprintf("%s/%04d-dump1090.log.gz",logDirectory,fileIndexNumber)
}
}
// Construct the CRC table. Adapted from FAA ref above.
@ -552,21 +563,41 @@ func replayLog(msg string, msgclass int) {
return
}
var fp *os.File
switch msgclass {
case MSGCLASS_UAT:
fp = uatReplayWriter
case MSGCLASS_ES:
fp = esReplayWriter
case MSGCLASS_GPS:
fp = gpsReplayWriter
case MSGCLASS_AHRS:
fp = ahrsReplayWriter
case MSGCLASS_DUMP1090:
fp = dump1090ReplayWriter
}
if fp != nil {
s := makeReplayLogEntry(msg)
fp.Write([]byte(s))
var wt *gzip.Writer
if developerMode == true {
switch msgclass {
case MSGCLASS_UAT:
fp = uatReplayWriter
case MSGCLASS_ES:
fp = esReplayWriter
case MSGCLASS_GPS:
fp = gpsReplayWriter
case MSGCLASS_AHRS:
fp = ahrsReplayWriter
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))
}
}
}
@ -896,6 +927,20 @@ func openReplay(fn string) (*os.File, error) {
return fp, err
}
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
}
func printStats() {
statTimer := time.NewTicker(30 * time.Second)
for {
@ -971,8 +1016,7 @@ func main() {
// replayESFilename := flag.String("eslog", "none", "ES Log filename")
replayUATFilename := flag.String("uatlog", "none", "UAT Log filename")
debugFlag := flag.Bool("debug", false, "Debug enabled")
uatFlag := flag.Bool("uatdisable", false, "Disable UAT reader")
develFlag := flag.Bool("developer", false, "Developer mode")
replayFlag := flag.Bool("replay", false, "Replay file flag")
replaySpeed := flag.Int("speed", 1, "Replay speed multiplier")
@ -981,6 +1025,11 @@ func main() {
timeStarted = time.Now()
runtime.GOMAXPROCS(runtime.NumCPU()) // redundant with Go v1.5+ compiler
if *develFlag == true {
log.Printf("Developer mode flag true!\n")
developerMode=true
}
// Duplicate log.* output to debugLog.
fp, err := os.OpenFile(debugLog, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
if err != nil {
@ -998,21 +1047,14 @@ func main() {
MsgLog = make([]msg, 0)
crcInit() // Initialize CRC16 table.
if *uatFlag == true {
log.Printf("UAT flag true!\n")
}
if *debugFlag == true {
log.Printf("Debug flag true!\n")
}
if *replayFlag == true {
// if (*replayESFilename == "none") || (*replayUATFilename == "none") {
// log.Fatal("Must specify both UAT and ES log files\n")
// }
log.Printf("Replay file %s\n", *replayUATFilename)
}
if *uatFlag != true {
sdrInit()
}
sdrInit()
initTraffic()
globalStatus.Version = stratuxVersion
@ -1022,41 +1064,77 @@ func main() {
// Set up the replay logs. Keep these files open in any case, even if replay logging is disabled.
// UAT replay log.
if uatwt, err := openReplay(uatReplayLog); err != nil {
globalSettings.ReplayLog = false
if developerMode == true {
if uatwt, err := openReplay(uatReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
uatReplayWriter = uatwt
defer uatReplayWriter.Close()
}
// 1090ES replay log.
if eswt, err := openReplay(esReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
esReplayWriter = eswt
defer esReplayWriter.Close()
}
// GPS replay log.
if gpswt, err := openReplay(gpsReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
gpsReplayWriter = gpswt
defer gpsReplayWriter.Close()
}
// AHRS replay log.
if ahrswt, err := openReplay(ahrsReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
ahrsReplayWriter = ahrswt
defer ahrsReplayWriter.Close()
}
// Dump1090 replay log.
if dump1090wt, err := openReplay(dump1090ReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
dump1090ReplayWriter = dump1090wt
defer dump1090ReplayWriter.Close()
}
} else {
uatReplayWriter = uatwt
defer uatReplayWriter.Close()
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()
}
}
// 1090ES replay log.
if eswt, err := openReplay(esReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
esReplayWriter = eswt
defer esReplayWriter.Close()
}
// GPS replay log.
if gpswt, err := openReplay(gpsReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
gpsReplayWriter = gpswt
defer gpsReplayWriter.Close()
}
// AHRS replay log.
if ahrswt, err := openReplay(ahrsReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
ahrsReplayWriter = ahrswt
defer ahrsReplayWriter.Close()
}
// Dump1090 replay log.
if dump1090wt, err := openReplay(dump1090ReplayLog); err != nil {
globalSettings.ReplayLog = false
} else {
dump1090ReplayWriter = dump1090wt
defer dump1090ReplayWriter.Close()
}
// Mark the files (whether we're logging or not).
replayMark(globalSettings.ReplayLog)