Merge pull request #178 from covexo/sync-improvements

Refactoring

Author: FabianKramm

pkg/devspace/sync/sync_config.go

@@ -52,6 +52,7 @@ type SyncConfig struct {
 
 	silent   bool
 	stopOnce sync.Once
+	stopped  bool
 
 	// Used for testing
 	testing   bool
@@ -88,7 +89,7 @@ func (s *SyncConfig) Error(err error) {
 		syncLog.WithKey("local", s.WatchPath).WithKey("container", s.DestPath).Errorf("Error: %v, Stack: %v", err, errors.ErrorStack(err))
 	}
 
-	if s.errorChan != nil {
+	if s.stopped == false && s.errorChan != nil {
 		s.errorChan <- err
 	}
 }
@@ -372,6 +373,8 @@ func (s *SyncConfig) sendChangesToUpstream(changes []*fileInformation) {
 // Stop stops the sync process
 func (s *SyncConfig) Stop() {
 	s.stopOnce.Do(func() {
+		s.stopped = true
+
 		if s.upstream != nil && s.upstream.interrupt != nil {
 			close(s.upstream.interrupt)
 

pkg/devspace/sync/upstream.go

@@ -257,6 +257,7 @@ func (u *upstream) applyCreates(files []*fileInformation) error {
 func (u *upstream) uploadArchive(file *os.File, fileSize string, writtenFiles map[string]*fileInformation) error {
 	u.config.fileIndex.fileMapMutex.Lock()
 	defer u.config.fileIndex.fileMapMutex.Unlock()
+	defer file.Close()
 
 	u.config.Logf("[Upstream] Upload %d create changes (size %s)", len(writtenFiles), fileSize)
 
@@ -287,30 +288,26 @@ func (u *upstream) uploadArchive(file *os.File, fileSize string, writtenFiles ma
 					echo "` + EndAck + `";
 		` // We need that extra new line or otherwise the command is not sent
 
-	if u.stdinPipe != nil {
-		// Write command
-		_, err := u.stdinPipe.Write([]byte(cmd))
-		if err != nil {
-			return errors.Trace(err)
-		}
-
-		// Wait till confirmation
-		err = waitTill(StartAck, u.stdoutPipe)
-		if err != nil {
-			return errors.Trace(err)
-		}
+	// Write command
+	_, err := u.stdinPipe.Write([]byte(cmd))
+	if err != nil {
+		return errors.Trace(err)
+	}
 
-		// Send file through stdin to remote
-		_, err = io.Copy(u.stdinPipe, file)
-		if err != nil {
-			return errors.Trace(err)
-		}
+	// Wait till confirmation
+	err = waitTill(StartAck, u.stdoutPipe)
+	if err != nil {
+		return errors.Trace(err)
 	}
 
-	file.Close()
+	// Send file through stdin to remote
+	_, err = io.Copy(u.stdinPipe, file)
+	if err != nil {
+		return errors.Trace(err)
+	}
 
 	// Delete local file
-	err := os.Remove(file.Name())
+	err = os.Remove(file.Name())
 	if err != nil {
 		return errors.Trace(err)
 	}