_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve logging

This commit is contained in:
Drew DeVault 2018-02-01 18:59:13 -05:00
parent d24e4712a4
commit 1767e4fab5
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/aerc/main.go
View File

@ -22,7 +22,7 @@ func main() {
} else { } else {
logOut = ioutil.Discard logOut = ioutil.Discard
} }
logger = log.New(logOut, "", log.LstdFlags|log.Lshortfile) logger = log.New(logOut, "", log.LstdFlags)
logger.Println("Starting up aerc") logger.Println("Starting up aerc")
conf, err := config.LoadConfig(nil) conf, err := config.LoadConfig(nil)
@ -37,9 +37,7 @@ func main() {
for _, account := range conf.Accounts { for _, account := range conf.Accounts {
logger.Printf("Initializing account %s\n", account.Name) logger.Printf("Initializing account %s\n", account.Name)
tab, err := ui.NewAccountTab(&account, log.New( tab, err := ui.NewAccountTab(&account, log.New(
logOut, logOut, fmt.Sprintf("[%s] ", account.Name), log.LstdFlags))
fmt.Sprintf("[%s] ", account.Name),
log.LstdFlags|log.Lshortfile))
if err != nil { if err != nil {
panic(err) panic(err)
} }

26
worker/types/worker.go
View File

@ -19,7 +19,11 @@ type Worker struct {
func (worker *Worker) PostAction(msg WorkerMessage, func (worker *Worker) PostAction(msg WorkerMessage,
cb func(msg WorkerMessage)) { cb func(msg WorkerMessage)) {
worker.Logger.Printf("=> %T\n", msg) if resp := msg.InResponseTo(); resp != nil {
worker.Logger.Printf("(ui)=> %T:%T\n", msg, resp)
} else {
worker.Logger.Printf("(ui)=> %T\n", msg)
}
worker.Actions <- msg worker.Actions <- msg
if cb != nil { if cb != nil {
@ -30,7 +34,11 @@ func (worker *Worker) PostAction(msg WorkerMessage,
func (worker *Worker) PostMessage(msg WorkerMessage, func (worker *Worker) PostMessage(msg WorkerMessage,
cb func(msg WorkerMessage)) { cb func(msg WorkerMessage)) {
worker.Logger.Printf("-> %T\n", msg) if resp := msg.InResponseTo(); resp != nil {
worker.Logger.Printf("->(ui) %T:%T\n", msg, resp)
} else {
worker.Logger.Printf("->(ui) %T\n", msg)
}
worker.Messages <- msg worker.Messages <- msg
if cb != nil { if cb != nil {
@ -39,8 +47,11 @@ func (worker *Worker) PostMessage(msg WorkerMessage,
} }
func (worker *Worker) ProcessMessage(msg WorkerMessage) WorkerMessage { func (worker *Worker) ProcessMessage(msg WorkerMessage) WorkerMessage {
if resp := msg.InResponseTo(); resp != nil {
worker.Logger.Printf("<= %T\n", msg) worker.Logger.Printf("(ui)<= %T:%T\n", msg, resp)
} else {
worker.Logger.Printf("(ui)<= %T\n", msg)
}
if cb, ok := worker.Callbacks[msg.InResponseTo()]; ok { if cb, ok := worker.Callbacks[msg.InResponseTo()]; ok {
cb(msg) cb(msg)
delete(worker.Callbacks, msg) delete(worker.Callbacks, msg)
@ -49,8 +60,11 @@ func (worker *Worker) ProcessMessage(msg WorkerMessage) WorkerMessage {
} }
func (worker *Worker) ProcessAction(msg WorkerMessage) WorkerMessage { func (worker *Worker) ProcessAction(msg WorkerMessage) WorkerMessage {
if resp := msg.InResponseTo(); resp != nil {
worker.Logger.Printf("<- %T\n", msg) worker.Logger.Printf("<-(ui) %T:%T\n", msg, resp)
} else {
worker.Logger.Printf("<-(ui) %T\n", msg)
}
if cb, ok := worker.Callbacks[msg.InResponseTo()]; ok { if cb, ok := worker.Callbacks[msg.InResponseTo()]; ok {
cb(msg) cb(msg)
delete(worker.Callbacks, msg) delete(worker.Callbacks, msg)