dnutiu/simplFT
dnutiu/simplFT
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hotfixing shutdown

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2017-12-15 21:32:22 +02:00
parent 58f80eda14
commit 5a23ff9478
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/server/connection.go
View file

@ -36,9 +36,9 @@ var uploadDirectory string
var uploadTimeout time.Duration var uploadTimeout time.Duration
// Shutdown is the shutdown where SIGINT and SIGTERM is send too // Shutdown is the shutdown where SIGINT and SIGTERM is send too
var Shutdown = make(chan os.Signal, 1) var Shutdown = make(chan os.Signal)
var ftpShutdown = make(chan struct{}, 1) var ftpShutdown = make(chan struct{})
var uploadShutdown = make(chan struct{}, 1) var uploadShutdown = make(chan struct{})
var uploadListener net.Listener var uploadListener net.Listener
var ftpListener net.Listener var ftpListener net.Listener
@ -101,19 +101,21 @@ func shutdownHandler() {
}() }()
wg.Wait() wg.Wait()
ShutdownFtpServer()
ShutdownUploadServer() ShutdownUploadServer()
ShutdownFtpServer()
return return
} }
} }
} }
func ShutdownUploadServer() { func ShutdownUploadServer() {
if viper.GetBool("upload.enabled") == true {
if uploadListener != nil { if uploadListener != nil {
uploadListener.Close() uploadListener.Close()
} }
uploadShutdown <- struct{}{} uploadShutdown <- struct{}{}
} }
}
func ShutdownFtpServer() { func ShutdownFtpServer() {
if ftpListener != nil { if ftpListener != nil {