new: centralized logging and implemented DELETE /api/events route, closes #5

This commit is contained in:
evilsocket 2018-01-08 06:39:44 +01:00
parent 269d7d845b
commit f1f146d3d7
21 changed files with 144 additions and 184 deletions

13
main.go
View file

@ -5,15 +5,12 @@ import (
"runtime"
"strings"
"github.com/op/go-logging"
"github.com/evilsocket/bettercap-ng/core"
"github.com/evilsocket/bettercap-ng/session"
"github.com/evilsocket/bettercap-ng/session/modules"
)
var sess *session.Session
var log = logging.MustGetLogger("mitm")
var err error
func main() {
@ -32,7 +29,7 @@ func main() {
sess.Register(session_modules.NewRestAPI(sess))
if err = sess.Start(); err != nil {
log.Fatal(err)
sess.Events.Log(session.FATAL, "%s", err)
}
defer sess.Close()
@ -41,21 +38,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 {
log.Fatal(err)
sess.Events.Log(session.FATAL, "%s", err)
}
}
}
if *sess.Options.Caplet != "" {
if err = sess.RunCaplet(*sess.Options.Caplet); err != nil {
log.Fatal(err)
sess.Events.Log(session.FATAL, "%s", err)
}
}
for sess.Active {
line, err := sess.ReadLine()
if err != nil {
log.Fatal(err)
sess.Events.Log(session.FATAL, "%s", err)
}
if line == "" || line[0] == '#' {
@ -63,7 +60,7 @@ func main() {
}
if err = sess.Run(line); err != nil {
log.Error(err)
sess.Events.Log(session.ERROR, "%s", err)
}
}
}