Merge pull request #157 from covexo/fix-sync-problem

Fix panic in CopyToContainer

Author: FabianKramm

Gopkg.lock

@@ -47,19 +47,25 @@ type SyncConfig struct {
 	upstream   *upstream
 	downstream *downstream
 
+	silent bool
+
 	// Used for testing
 	testing   bool
 	errorChan chan error
 }
 
 // Logf prints the given information to the synclog with context data
 func (s *SyncConfig) Logf(format string, args ...interface{}) {
-	syncLog.WithKey("local", s.WatchPath).WithKey("container", s.DestPath).WithKey("excluded", s.ExcludePaths).Infof(format, args...)
+	if s.silent == false {
+		syncLog.WithKey("local", s.WatchPath).WithKey("container", s.DestPath).WithKey("excluded", s.ExcludePaths).Infof(format, args...)
+	}
 }
 
 // Logln prints the given information to the synclog with context data
 func (s *SyncConfig) Logln(line interface{}) {
-	syncLog.WithKey("local", s.WatchPath).WithKey("container", s.DestPath).WithKey("excluded", s.ExcludePaths).Info(line)
+	if s.silent == false {
+		syncLog.WithKey("local", s.WatchPath).WithKey("container", s.DestPath).WithKey("excluded", s.ExcludePaths).Info(line)
+	}
 }
 
 // Error handles a sync error with context
@@ -334,7 +340,7 @@ func (s *SyncConfig) diffDir(filepath string, sendChanges *[]*fileInformation, d
 
 //Stop stops the sync process
 func (s *SyncConfig) Stop() {
-	if s.upstream != nil {
+	if s.upstream != nil && s.upstream.interrupt != nil {
 		select {
 		case <-s.upstream.interrupt:
 		default:
@@ -355,7 +361,7 @@ func (s *SyncConfig) Stop() {
 		}
 	}
 
-	if s.downstream != nil {
+	if s.downstream != nil && s.downstream.interrupt != nil {
 		select {
 		case <-s.downstream.interrupt:
 		default:

pkg/devspace/sync/sync_config.go

@@ -36,6 +36,7 @@ func CopyToContainer(Kubectl *kubernetes.Clientset, Pod *k8sv1.Pod, Container *k
 		WatchPath:    getRelativeFromFullPath(LocalPath, ""),
 		DestPath:     ContainerPath,
 		ExcludePaths: ExcludePaths,
+		silent:       true,
 	}
 
 	syncLog = log.GetInstance()