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:34:39 +02:00
parent 5a23ff9478
commit 3527f501de
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/server/connection.go
View file

@ -35,6 +35,9 @@ var uploadDirectory string
// uploadTimeout is the amount in seconds the server will wait for a file to be uploaded // uploadTimeout is the amount in seconds the server will wait for a file to be uploaded
var uploadTimeout time.Duration var uploadTimeout time.Duration
// uploadEnabled holds true of false, if in the config upload was enabled when the upload server was started.
var uploadEnabled bool
// 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) var Shutdown = make(chan os.Signal)
var ftpShutdown = make(chan struct{}) var ftpShutdown = make(chan struct{})
@ -109,7 +112,7 @@ func shutdownHandler() {
} }
func ShutdownUploadServer() { func ShutdownUploadServer() {
if viper.GetBool("upload.enabled") == true { if uploadEnabled == true {
if uploadListener != nil { if uploadListener != nil {
uploadListener.Close() uploadListener.Close()
} }
@ -276,7 +279,8 @@ func HandleUpload(conn net.Conn) {
func StartUploadServer(wg *sync.WaitGroup) error { func StartUploadServer(wg *sync.WaitGroup) error {
defer wg.Done() defer wg.Done()
var err error var err error
if viper.GetBool("upload.enabled") == false { uploadEnabled = viper.GetBool("upload.enabled")
if uploadEnabled == false {
log.Println("Uploading not enabled. To enable modify the config file and restart the server") log.Println("Uploading not enabled. To enable modify the config file and restart the server")
return ErrUploadServerFailure return ErrUploadServerFailure
} }