mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-25 22:45:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

*: fixed some linter warnings

Browse source
This commit is contained in:
Andrey Meshkov 2020-02-11 12:59:21 +03:00
parent 808618602c
commit c5ca2a779c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
home/home.go
View file

@ -334,7 +334,7 @@ func writePIDFile(fn string) bool {
// initWorkingDir initializes the ourWorkingDir // initWorkingDir initializes the ourWorkingDir
// if no command-line arguments specified, we use the directory where our binary file is located // if no command-line arguments specified, we use the directory where our binary file is located
func initWorkingDir(args options) { func initWorkingDir(args options) {
exec, err := os.Executable() execPath, err := os.Executable()
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -343,7 +343,7 @@ func initWorkingDir(args options) {
// If there is a custom config file, use it's directory as our working dir // If there is a custom config file, use it's directory as our working dir
config.ourWorkingDir = args.workDir config.ourWorkingDir = args.workDir
} else { } else {
config.ourWorkingDir = filepath.Dir(exec) config.ourWorkingDir = filepath.Dir(execPath)
} }
} }
@ -412,16 +412,16 @@ func stopHTTPServer() {
log.Info("Stopping HTTP server...") log.Info("Stopping HTTP server...")
Context.httpsServer.shutdown = true Context.httpsServer.shutdown = true
if Context.httpsServer.server != nil { if Context.httpsServer.server != nil {
Context.httpsServer.server.Shutdown(context.TODO()) _ = Context.httpsServer.server.Shutdown(context.TODO())
} }
Context.httpServer.Shutdown(context.TODO()) _ = Context.httpServer.Shutdown(context.TODO())
log.Info("Stopped HTTP server") log.Info("Stopped HTTP server")
} }
// This function is called before application exits // This function is called before application exits
func cleanupAlways() { func cleanupAlways() {
if len(config.pidFileName) != 0 { if len(config.pidFileName) != 0 {
os.Remove(config.pidFileName) _ = os.Remove(config.pidFileName)
} }
log.Info("Stopped") log.Info("Stopped")
} }