merge cleanup
This commit is contained in:
parent
a3839ec603
commit
eecf0cd90c
7
main.go
7
main.go
@ -19,8 +19,9 @@ func init() {
|
|||||||
// initialize database engine
|
// initialize database engine
|
||||||
eros.Awaken()
|
eros.Awaken()
|
||||||
|
|
||||||
|
// TODO: make this a commandline argument
|
||||||
// assure the log directory exists
|
// assure the log directory exists
|
||||||
var logDir string = "./"
|
var logDir string = "./.logs/"
|
||||||
|
|
||||||
// we will want the below snippet if we end up using a log directory that isn't ./
|
// we will want the below snippet if we end up using a log directory that isn't ./
|
||||||
/*
|
/*
|
||||||
@ -39,7 +40,7 @@ func init() {
|
|||||||
panic(err.Error())
|
panic(err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// initalize pretty printer
|
// define pretty printer
|
||||||
consoleWriter := zerolog.ConsoleWriter{Out: os.Stderr}
|
consoleWriter := zerolog.ConsoleWriter{Out: os.Stderr}
|
||||||
|
|
||||||
// initialize simultaneous pretty printing and json logging
|
// initialize simultaneous pretty printing and json logging
|
||||||
@ -74,7 +75,7 @@ func main() {
|
|||||||
|
|
||||||
if result.Address.String() == *projVars.Target {
|
if result.Address.String() == *projVars.Target {
|
||||||
log.Info().Str("address", result.Address.String()).
|
log.Info().Str("address", result.Address.String()).
|
||||||
Int16("RSSI", result.RSSI).Str("LocalName",result.LocalName())
|
Int16("RSSI", result.RSSI).Str("LocalName", result.LocalName())
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -31,10 +31,6 @@ func Scanners() {
|
|||||||
//results := new(bluetooth.ScanResult)
|
//results := new(bluetooth.ScanResult)
|
||||||
|
|
||||||
projVars.ScanAdapter.Scan(func(scanAdapter *bluetooth.Adapter, device bluetooth.ScanResult) {
|
projVars.ScanAdapter.Scan(func(scanAdapter *bluetooth.Adapter, device bluetooth.ScanResult) {
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 29dc71980394d77fbde57905befab1a486a49e27
|
|
||||||
if device.LocalName() != projVars.ScanList[device.Address.String()] {
|
if device.LocalName() != projVars.ScanList[device.Address.String()] {
|
||||||
log.Info().Str("address", device.Address.String()).
|
log.Info().Str("address", device.Address.String()).
|
||||||
Str("LocalName", device.LocalName()).
|
Str("LocalName", device.LocalName()).
|
||||||
|
Loading…
Reference in New Issue
Block a user