Merge pull request #1886 from hashicorp/lock-logger

Making the executor lock the logger
hashicorp · Oct 28, 2016 · 1176e5f · 1176e5f
2 parents f0dd21f + 6acfa45
commit 1176e5f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
@@ -374,11 +374,15 @@ func (e *UniversalExecutor) UpdateTask(task *structs.Task) error {
 	e.ctx.Task = task
 
 	// Updating Log Config
-	fileSize := int64(task.LogConfig.MaxFileSizeMB * 1024 * 1024)
-	e.lro.MaxFiles = task.LogConfig.MaxFiles
-	e.lro.FileSize = fileSize
-	e.lre.MaxFiles = task.LogConfig.MaxFiles
-	e.lre.FileSize = fileSize
+	e.rotatorLock.Lock()
+	if e.lro != nil && e.lre != nil {
+		fileSize := int64(task.LogConfig.MaxFileSizeMB * 1024 * 1024)
+		e.lro.MaxFiles = task.LogConfig.MaxFiles
+		e.lro.FileSize = fileSize
+		e.lre.MaxFiles = task.LogConfig.MaxFiles
+		e.lre.FileSize = fileSize
+	}
+	e.rotatorLock.Unlock()
 
 	// Re-syncing task with Consul agent
 	if e.consulSyncer != nil {