More cleanup.

Author: AlliBalliBaba

frankenphp.go

@@ -477,10 +477,6 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error
 	return nil
 }
 
-func handleRequest(thread *phpThread) {
-
-}
-
 func maybeCloseContext(fc *FrankenPHPContext) {
 	fc.closed.Do(func() {
 		close(fc.done)

main-thread.go

@@ -7,6 +7,8 @@ import (
 	"sync"
 )
 
+// represents the main PHP thread
+// the thread needs to keep running as long as all other threads are running
 type mainPHPThread struct {
 	state      *threadState
 	done       chan struct{}

worker.go

@@ -24,13 +24,11 @@ type worker struct {
 
 var (
 	workers          map[string]*worker
-	workersDone      chan interface{}
 	watcherIsEnabled bool
 )
 
 func initWorkers(opt []workerOpt) error {
 	workers = make(map[string]*worker, len(opt))
-	workersDone = make(chan interface{})
 	directoriesToWatch := getDirectoriesToWatch(opt)
 	watcherIsEnabled = len(directoriesToWatch) > 0
 
@@ -45,7 +43,7 @@ func initWorkers(opt []workerOpt) error {
 		}
 	}
 
-	if len(directoriesToWatch) == 0 {
+	if !watcherIsEnabled {
 		return nil
 	}
 
@@ -78,13 +76,8 @@ func newWorker(o workerOpt) (*worker, error) {
 	return w, nil
 }
 
-func stopWorkers() {
-	close(workersDone)
-}
-
 func drainWorkers() {
 	watcher.DrainWatcher()
-	stopWorkers()
 }
 
 func restartWorkers() {
@@ -101,7 +94,6 @@ func restartWorkers() {
 			}(thread)
 		}
 	}
-	stopWorkers()
 	ready.Wait()
 	for _, worker := range workers {
 		for _, thread := range worker.threads {
@@ -110,7 +102,6 @@ func restartWorkers() {
 		}
 		worker.threadMutex.RUnlock()
 	}
-	workersDone = make(chan interface{})
 }
 
 func getDirectoriesToWatch(workerOpts []workerOpt) []string {