move logic into request_enqueue()

in our quest to simplify queue_or_run.  So that eventually the
timer, etc. work can be done in a child thread

src/main/process.c

@@ -888,22 +888,7 @@ static void request_queue_or_run(REQUEST *request,
 
 	STATE_MACHINE_TIMER(FR_ACTION_TIMER);
 
-	if (spawn_workers) {
-		request_enqueue(request);
-		return;
-	}
-
-	request->child_state = REQUEST_RUNNING;
-	request->process(request, FR_ACTION_RUN);
-
-#ifdef WNOHANG
-	/*
-	 *	Requests that care about child process exit
-	 *	codes have already either called
-	 *	rad_waitpid(), or they've given up.
-	 */
-	while (waitpid(-1, NULL, WNOHANG) > 0);
-#endif
+	request_enqueue(request);
 }
 
 

src/main/threads.c

@@ -305,6 +305,25 @@ void request_enqueue(REQUEST *request)
 
 	request->component = "<core>";
 	request->module = "<queue>";
+
+	/*
+	 *	No child threads, just process it here.
+	 */
+	if (!thread_pool.spawn_workers) {
+		request->child_state = REQUEST_RUNNING;
+		request->process(request, FR_ACTION_RUN);
+
+#ifdef WNOHANG
+		/*
+		 *	Requests that care about child process exit
+		 *	codes have already either called
+		 *	rad_waitpid(), or they've given up.
+		 */
+		while (waitpid(-1, NULL, WNOHANG) > 0);
+#endif
+		return;
+	}
+
 	request->child_state = REQUEST_QUEUED;
 
 	/*