github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-06 04:52:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: each module now has its own tagged logging

Browse source
This commit is contained in:
evilsocket 2019-02-12 15:16:02 +01:00
parent 9003be56ca
commit 9cd4e380fb
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
47 changed files with 343 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/https_server/https_server.go
View file

@ -7,7 +7,6 @@ import (
"strings"
"time"
"github.com/bettercap/bettercap/log"
"github.com/bettercap/bettercap/session"
"github.com/bettercap/bettercap/tls"
@ -101,7 +100,7 @@ func (httpd *HttpsServer) Configure() error {
fileServer := http.FileServer(http.Dir(path))
router.HandleFunc("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
log.Info("(%s) %s %s %s%s", tui.Green("https"), tui.Bold(strings.Split(r.RemoteAddr, ":")[0]), r.Method, r.Host, r.URL.Path)
httpd.Info("%s %s %s%s", tui.Bold(strings.Split(r.RemoteAddr, ":")[0]), r.Method, r.Host, r.URL.Path)
fileServer.ServeHTTP(w, r)
}))
@ -135,15 +134,15 @@ func (httpd *HttpsServer) Configure() error {
return err
}
log.Debug("%+v", cfg)
log.Info("generating server TLS key to %s", keyFile)
log.Info("generating server TLS certificate to %s", certFile)
httpd.Debug("%+v", cfg)
httpd.Info("generating server TLS key to %s", keyFile)
httpd.Info("generating server TLS certificate to %s", certFile)
if err := tls.Generate(cfg, certFile, keyFile); err != nil {
return err
}
} else {
log.Info("loading server TLS key from %s", keyFile)
log.Info("loading server TLS certificate from %s", certFile)
httpd.Info("loading server TLS key from %s", keyFile)
httpd.Info("loading server TLS certificate from %s", certFile)
}
httpd.certFile = certFile
@ -158,7 +157,7 @@ func (httpd *HttpsServer) Start() error {
}
return httpd.SetRunning(true, func() {
log.Info("HTTPS server starting on https://%s", httpd.server.Addr)
httpd.Info("starting on https://%s", httpd.server.Addr)
if err := httpd.server.ListenAndServeTLS(httpd.certFile, httpd.keyFile); err != nil && err != http.ErrServerClosed {
panic(err)
}