Merge pull request #230 from covexo/sync-fixes

FabianKramm · web-flow · commit 0fda603aca11 · 2018-09-20T12:23:18.000+02:00
Fix race problem in sync
diff --git a/pkg/devspace/sync/util.go b/pkg/devspace/sync/util.go
@@ -56,7 +56,7 @@ func copyToContainerTestable(Kubectl *kubernetes.Clientset, Pod *k8sv1.Pod, Cont
 		testing:      testing,
 	}
 
-	syncLog = log.GetInstance()
+	// syncLog = log.GetInstance()
 	s.setup()
 
 	err = s.upstream.start()
@@ -78,7 +78,7 @@ func copyToContainerTestable(Kubectl *kubernetes.Clientset, Pod *k8sv1.Pod, Cont
 
 	s.Stop()
 
-	syncLog = nil
+	// syncLog = nil
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func copyToContainerTestable(Kubectl kubernetes.Clientset, Pod k8sv1.Pod, Cont`
`56`	`56`	`testing: testing,`
`57`	`57`	`}`
`58`	`58`
`59`		`- syncLog = log.GetInstance()`
	`59`	`+ // syncLog = log.GetInstance()`
`60`	`60`	`s.setup()`
`61`	`61`
`62`	`62`	`err = s.upstream.start()`
`@@ -78,7 +78,7 @@ func copyToContainerTestable(Kubectl kubernetes.Clientset, Pod k8sv1.Pod, Cont`
`78`	`78`
`79`	`79`	`s.Stop()`
`80`	`80`
`81`		`- syncLog = nil`
	`81`	`+ // syncLog = nil`
`82`	`82`
`83`	`83`	`return nil`
`84`	`84`	`}`