kopia lustrzana https://github.com/cyoung/stratux
Cleanup old logging code. Comments.
rodzic
89107818b8
commit
4313e02fc7
|
@ -38,13 +38,11 @@ import (
|
||||||
|
|
||||||
const (
|
const (
|
||||||
configLocation = "/etc/stratux.conf"
|
configLocation = "/etc/stratux.conf"
|
||||||
indexFilename = "/var/log/stratux/LOGINDEX"
|
|
||||||
managementAddr = ":80"
|
managementAddr = ":80"
|
||||||
debugLog = "/var/log/stratux.log"
|
debugLog = "/var/log/stratux.log"
|
||||||
|
dataLogFile = "/var/log/stratux.sqlite"
|
||||||
maxDatagramSize = 8192
|
maxDatagramSize = 8192
|
||||||
maxUserMsgQueueSize = 25000 // About 10MB per port per connected client.
|
maxUserMsgQueueSize = 25000 // About 10MB per port per connected client.
|
||||||
logDirectory = "/var/log/stratux"
|
|
||||||
dataLogFile = "/var/log/stratux.sqlite"
|
|
||||||
|
|
||||||
UPLINK_BLOCK_DATA_BITS = 576
|
UPLINK_BLOCK_DATA_BITS = 576
|
||||||
UPLINK_BLOCK_BITS = (UPLINK_BLOCK_DATA_BITS + 160)
|
UPLINK_BLOCK_BITS = (UPLINK_BLOCK_DATA_BITS + 160)
|
||||||
|
@ -126,36 +124,6 @@ type ADSBTower struct {
|
||||||
|
|
||||||
var ADSBTowers map[string]ADSBTower // Running list of all towers seen. (lat,lng) -> ADSBTower
|
var ADSBTowers map[string]ADSBTower // Running list of all towers seen. (lat,lng) -> ADSBTower
|
||||||
|
|
||||||
func constructFilenames() {
|
|
||||||
var fileIndexNumber uint
|
|
||||||
|
|
||||||
// First, create the log file directory if it does not exist
|
|
||||||
os.Mkdir(logDirectory, 0755)
|
|
||||||
|
|
||||||
f, err := os.Open(indexFilename)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Unable to open index file %s using index of 0\n", indexFilename)
|
|
||||||
fileIndexNumber = 0
|
|
||||||
} else {
|
|
||||||
_, err := fmt.Fscanf(f, "%d\n", &fileIndexNumber)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Unable to read index file %s using index of 0\n", indexFilename)
|
|
||||||
}
|
|
||||||
f.Close()
|
|
||||||
fileIndexNumber++
|
|
||||||
}
|
|
||||||
fo, err := os.Create(indexFilename)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Error creating index file %s\n", indexFilename)
|
|
||||||
}
|
|
||||||
_, err2 := fmt.Fprintf(fo, "%d\n", fileIndexNumber)
|
|
||||||
if err2 != nil {
|
|
||||||
log.Printf("Error writing to index file %s\n", indexFilename)
|
|
||||||
}
|
|
||||||
fo.Sync()
|
|
||||||
fo.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Construct the CRC table. Adapted from FAA ref above.
|
// Construct the CRC table. Adapted from FAA ref above.
|
||||||
func crcInit() {
|
func crcInit() {
|
||||||
var i uint16
|
var i uint16
|
||||||
|
@ -1259,7 +1227,6 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("Stratux %s (%s) starting.\n", stratuxVersion, stratuxBuild)
|
log.Printf("Stratux %s (%s) starting.\n", stratuxVersion, stratuxBuild)
|
||||||
constructFilenames()
|
|
||||||
|
|
||||||
ADSBTowers = make(map[string]ADSBTower)
|
ADSBTowers = make(map[string]ADSBTower)
|
||||||
MsgLog = make([]msg, 0)
|
MsgLog = make([]msg, 0)
|
||||||
|
|
|
@ -401,6 +401,7 @@ type dirlisting struct {
|
||||||
ServerUA string
|
ServerUA string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//FIXME: This needs to be switched to show a "sessions log" from the sqlite database.
|
||||||
func viewLogs(w http.ResponseWriter, r *http.Request) {
|
func viewLogs(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
names, err := ioutil.ReadDir("/var/log/stratux/")
|
names, err := ioutil.ReadDir("/var/log/stratux/")
|
||||||
|
|
Ładowanie…
Reference in New Issue