1 files changed, 5 insertions, 28 deletions
diff --git a/libpod/runtime_worker.go b/libpod/runtime_worker.go
index ca44a27f7..9d41321b2 100644
--- a/libpod/runtime_worker.go
+++ b/libpod/runtime_worker.go
@@ -1,40 +1,17 @@
 package libpod
 
-import (
-	"time"
-)
-
 func (r *Runtime) startWorker() {
-	if r.workerChannel == nil {
-		r.workerChannel = make(chan func(), 1)
-		r.workerShutdown = make(chan bool)
-	}
+	r.workerChannel = make(chan func(), 10)
 	go func() {
-		for {
-			// Make sure to read all workers before
-			// checking if we're about to shutdown.
-			for len(r.workerChannel) > 0 {
-				w := <-r.workerChannel
-				w()
-			}
-
-			select {
-			// We'll read from the shutdown channel only when all
-			// items above have been processed.
-			//
-			// (*Runtime).Shutdown() will block until until the
-			// item is read.
-			case <-r.workerShutdown:
-				return
-
-			default:
-				time.Sleep(100 * time.Millisecond)
-			}
+		for w := range r.workerChannel {
+			w()
+			r.workerGroup.Done()
 		}
 	}()
 }
 
 func (r *Runtime) queueWork(f func()) {
+	r.workerGroup.Add(1)
 	go func() {
 		r.workerChannel <- f
 	}()