Fix issue with log destroyed error message on mount and extra logs on unmount

Author: jfantinhardesty

cmd/unmount.go

@@ -34,7 +34,6 @@ import (
 	"strings"
 
 	"github.com/Seagate/cloudfuse/common"
-	"github.com/Seagate/cloudfuse/common/log"
 
 	"github.com/spf13/cobra"
 )
@@ -137,7 +136,6 @@ func unmountCloudfuse(mntPath string, lazy bool, silent bool) error {
 		_, err = cliOut.Output()
 
 		if err == nil {
-			log.Info("unmountCloudfuse : successfully unmounted %s", mntPath)
 			if !silent {
 				fmt.Println("Successfully unmounted", mntPath)
 			}

common/log/base_logger.go

@@ -51,8 +51,9 @@ type LogFileConfig struct {
 }
 
 type BaseLogger struct {
-	channel    chan (string)
-	workerDone sync.WaitGroup
+	channel     chan (string)
+	workerDone  sync.WaitGroup
+	destroyOnce sync.Once
 
 	logger        *log.Logger
 	logFileHandle io.WriteCloser
@@ -202,18 +203,27 @@ func (l *BaseLogger) init() error {
 }
 
 func (l *BaseLogger) Destroy() error {
-	close(l.channel)
-	l.workerDone.Wait()
+	var destroyErr error
+	l.destroyOnce.Do(func() {
+		if l.channel != nil {
+			close(l.channel)
+			l.channel = nil
+		}
+		l.workerDone.Wait()
 
-	// Never close stdout/stderr
-	if l.logFileHandle == os.Stdout || l.logFileHandle == os.Stderr {
-		return nil
-	}
+		// Never close stdout/stderr
+		if l.logFileHandle == os.Stdout || l.logFileHandle == os.Stderr {
+			return
+		}
+		if l.logFileHandle == nil {
+			return
+		}
+		if err := l.logFileHandle.Close(); err != nil {
+			destroyErr = err
+		}
+	})
 
-	if err := l.logFileHandle.Close(); err != nil {
-		return err
-	}
-	return nil
+	return destroyErr
 }
 
 // logEvent : Enqueue the log to the channel