more cleanup

Author: dunglas

caddy/admin.go

@@ -44,7 +44,7 @@ func (admin *FrankenPHPAdmin) restartWorkers(w http.ResponseWriter, r *http.Requ
 	return nil
 }
 
-func (admin *FrankenPHPAdmin) threads(w http.ResponseWriter, r *http.Request) error {
+func (admin *FrankenPHPAdmin) threads(w http.ResponseWriter, _ *http.Request) error {
 	debugState := frankenphp.DebugState()
 	prettyJson, err := json.MarshalIndent(debugState, "", "    ")
 	if err != nil {

cgi.go

@@ -168,7 +168,7 @@ func packCgiVariable(key *C.zend_string, value string) C.ht_key_value_pair {
 	return C.ht_key_value_pair{key, toUnsafeChar(value), C.size_t(len(value))}
 }
 
-func addHeadersToServer(thread *phpThread, fc *frankenPHPContext, trackVarsArray *C.zval) {
+func addHeadersToServer(fc *frankenPHPContext, trackVarsArray *C.zval) {
 	for field, val := range fc.request.Header {
 		if k := mainThread.commonHeaders[field]; k != nil {
 			v := strings.Join(val, ", ")
@@ -197,7 +197,7 @@ func go_register_variables(threadIndex C.uintptr_t, trackVarsArray *C.zval) {
 	fc := thread.getRequestContext()
 
 	addKnownVariablesToServer(thread, fc, trackVarsArray)
-	addHeadersToServer(thread, fc, trackVarsArray)
+	addHeadersToServer(fc, trackVarsArray)
 
 	// The Prepared Environment is registered last and can overwrite any previous values
 	addPreparedEnvToServer(fc, trackVarsArray)

internal/watcher/watcher.go

@@ -187,7 +187,6 @@ func listenForFileEvents(triggerWatcher chan string, stopWatcher chan struct{})
 	for {
 		select {
 		case <-stopWatcher:
-			break
 		case lastChangedFile = <-triggerWatcher:
 			timer.Reset(debounceDuration)
 		case <-timer.C:

metrics.go

@@ -11,7 +11,7 @@ import (
 const (
 	StopReasonCrash = iota
 	StopReasonRestart
-	StopReasonShutdown
+	//StopReasonShutdown
 )
 
 type StopReason int
@@ -74,9 +74,9 @@ func (n nullMetrics) StartWorkerRequest(string) {
 func (n nullMetrics) Shutdown() {
 }
 
-func (n nullMetrics) QueuedWorkerRequest(name string) {}
+func (n nullMetrics) QueuedWorkerRequest(string) {}
 
-func (n nullMetrics) DequeuedWorkerRequest(name string) {}
+func (n nullMetrics) DequeuedWorkerRequest(string) {}
 
 func (n nullMetrics) QueuedRequest()   {}
 func (n nullMetrics) DequeuedRequest() {}
@@ -127,9 +127,10 @@ func (m *PrometheusMetrics) StopWorker(name string, reason StopReason) {
 	m.totalWorkers.WithLabelValues(name).Dec()
 	m.readyWorkers.WithLabelValues(name).Dec()
 
-	if reason == StopReasonCrash {
+	switch reason {
+	case StopReasonCrash:
 		m.workerCrashes.WithLabelValues(name).Inc()
-	} else if reason == StopReasonRestart {
+	case StopReasonRestart:
 		m.workerRestarts.WithLabelValues(name).Inc()
 	}
 }

phpmainthread.go

@@ -144,15 +144,6 @@ func getInactivePHPThread() *phpThread {
 	return nil
 }
 
-func getPHPThreadAtState(state stateID) *phpThread {
-	for _, thread := range phpThreads {
-		if thread.state.is(state) {
-			return thread
-		}
-	}
-	return nil
-}
-
 //export go_frankenphp_main_thread_is_ready
 func go_frankenphp_main_thread_is_ready() {
 	mainThread.setAutomaticMaxThreads()

phpmainthread_test.go

@@ -220,7 +220,7 @@ func allPossibleTransitions(worker1Path string, worker2Path string) []func(*phpT
 
 func TestCorrectThreadCalculation(t *testing.T) {
 	maxProcs := runtime.GOMAXPROCS(0) * 2
-	oneWorkerThread := []workerOpt{workerOpt{num: 1}}
+	oneWorkerThread := []workerOpt{{num: 1}}
 
 	// default values
 	testThreadCalculation(t, maxProcs, maxProcs, &opt{})

scaling.go

@@ -20,8 +20,6 @@ const (
 	cpuProbeTime = 120 * time.Millisecond
 	// do not scale over this amount of CPU usage
 	maxCpuUsageForScaling = 0.8
-	// upscale stalled threads every x milliseconds
-	upscaleCheckTime = 100 * time.Millisecond
 	// downscale idle threads every x seconds
 	downScaleCheckTime = 5 * time.Second
 	// max amount of threads stopped in one iteration of downScaleCheckTime
@@ -31,13 +29,11 @@ const (
 )
 
 var (
+	ErrMaxThreadsReached = errors.New("max amount of overall threads reached")
+
 	scaleChan         chan *frankenPHPContext
 	autoScaledThreads = []*phpThread{}
 	scalingMu         = new(sync.RWMutex)
-
-	MaxThreadsReachedError      = errors.New("max amount of overall threads reached")
-	CannotRemoveLastThreadError = errors.New("cannot remove last thread")
-	WorkerNotFoundError         = errors.New("worker not found for given filename")
 )
 
 func initAutoScaling(mainThread *phpMainThread) {
@@ -67,7 +63,7 @@ func drainAutoScaling() {
 func addRegularThread() (*phpThread, error) {
 	thread := getInactivePHPThread()
 	if thread == nil {
-		return nil, MaxThreadsReachedError
+		return nil, ErrMaxThreadsReached
 	}
 	convertToRegularThread(thread)
 	thread.state.waitFor(stateReady, stateShuttingDown, stateReserved)
@@ -77,7 +73,7 @@ func addRegularThread() (*phpThread, error) {
 func addWorkerThread(worker *worker) (*phpThread, error) {
 	thread := getInactivePHPThread()
 	if thread == nil {
-		return nil, MaxThreadsReachedError
+		return nil, ErrMaxThreadsReached
 	}
 	convertToWorkerThread(thread, worker)
 	thread.state.waitFor(stateReady, stateShuttingDown, stateReserved)

threadinactive.go

@@ -33,7 +33,7 @@ func (handler *inactiveThread) beforeScriptExecution() string {
 	panic("unexpected state: " + thread.state.name())
 }
 
-func (handler *inactiveThread) afterScriptExecution(exitStatus int) {
+func (handler *inactiveThread) afterScriptExecution(int) {
 	panic("inactive threads should not execute scripts")
 }
 

threadregular.go

@@ -47,7 +47,7 @@ func (handler *regularThread) beforeScriptExecution() string {
 }
 
 // return true if the worker should continue to run
-func (handler *regularThread) afterScriptExecution(exitStatus int) {
+func (handler *regularThread) afterScriptExecution(int) {
 	handler.afterRequest()
 }