github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-13 16:43:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Minor refactors using golint"

Browse source
This commit is contained in:
Simone Margaritelli 2018-05-03 12:31:42 +02:00 • committed by GitHub
parent 9196be7a8b
commit 5328ced392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 101 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/http_proxy_base.go
View file

@ -115,8 +115,9 @@ func (p *HTTPProxy) Configure(address string, proxyPort int, httpPort int, scrip
if scriptPath != "" {
if err, p.Script = LoadHttpProxyScript(scriptPath, p.sess); err != nil {
return err
} else {
log.Debug("Proxy script %s loaded.", scriptPath)
}
log.Debug("Proxy script %s loaded.", scriptPath)
}
p.Server = &http.Server{
@ -335,9 +336,9 @@ func (p *HTTPProxy) Stop() error {
p.isRunning = false
p.sniListener.Close()
return nil
} else {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
return p.Server.Shutdown(ctx)
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
return p.Server.Shutdown(ctx)
}