mirror of
https://github.com/bettercap/bettercap
synced 2025-08-19 13:09:49 -07:00
fix: logging improved
This commit is contained in:
parent
c8a52d3256
commit
10b05dd0eb
3 changed files with 12 additions and 6 deletions
10
main.go
10
main.go
|
@ -31,11 +31,11 @@ func main() {
|
|||
sess.Register(modules.NewRestAPI(sess))
|
||||
|
||||
if err = sess.Start(); err != nil {
|
||||
panic(err)
|
||||
log.Fatal("%", err)
|
||||
}
|
||||
|
||||
if err = sess.Run("events.stream on"); err != nil {
|
||||
panic(err)
|
||||
log.Fatal("%", err)
|
||||
}
|
||||
|
||||
defer sess.Close()
|
||||
|
@ -44,21 +44,21 @@ func main() {
|
|||
for _, cmd := range strings.Split(*sess.Options.Commands, ";") {
|
||||
cmd = strings.Trim(cmd, "\r\n\t ")
|
||||
if err = sess.Run(cmd); err != nil {
|
||||
panic(err)
|
||||
log.Fatal("%s", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if *sess.Options.Caplet != "" {
|
||||
if err = sess.RunCaplet(*sess.Options.Caplet); err != nil {
|
||||
panic(err)
|
||||
log.Fatal("%s", err)
|
||||
}
|
||||
}
|
||||
|
||||
for sess.Active {
|
||||
line, err := sess.ReadLine()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
log.Fatal("%s", err)
|
||||
}
|
||||
|
||||
if line == "" || line[0] == '#' {
|
||||
|
|
|
@ -47,6 +47,9 @@ func FindInterface(name string) (*Endpoint, error) {
|
|||
}
|
||||
|
||||
if e != nil {
|
||||
if len(e.HW) == 0 {
|
||||
return nil, fmt.Errorf("Could not detect interface hardware address.")
|
||||
}
|
||||
return e, nil
|
||||
}
|
||||
}
|
||||
|
|
|
@ -111,12 +111,15 @@ func (p *EventPool) Log(level int, format string, args ...interface{}) {
|
|||
return
|
||||
}
|
||||
|
||||
message := fmt.Sprintf(format, args)
|
||||
|
||||
p.Add("sys.log", LogMessage{
|
||||
level,
|
||||
fmt.Sprintf(format, args...),
|
||||
message,
|
||||
})
|
||||
|
||||
if level == FATAL {
|
||||
fmt.Fprintf(os.Stderr, "%s\n", message)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue