Automatically disable worker mode in local environments if workers ar…

…en't specified explicitly
laravel · Jul 24, 2024 · 611b90b · 611b90b
1 parent e5126e7
commit 611b90b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Commands/StartFrankenPhpCommand.php b/src/Commands/StartFrankenPhpCommand.php
@@ -93,12 +93,14 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
             'APP_ENV' => app()->environment(),
             'APP_BASE_PATH' => base_path(),
             'APP_PUBLIC_PATH' => public_path(),
+            'APP_INDEX_FILE' => $this->workerCount() == 0 && app()->environment('local') ? 'index.php' : 'frankenphp-worker.php',
             'LARAVEL_OCTANE' => 1,
             'MAX_REQUESTS' => $this->option('max-requests'),
             'REQUEST_MAX_EXECUTION_TIME' => $this->maxExecutionTime(),
             'CADDY_GLOBAL_OPTIONS' => ($https && $this->option('http-redirect')) ? '' : 'auto_https disable_redirects',
             'CADDY_SERVER_ADMIN_PORT' => $this->adminPort(),
             'CADDY_SERVER_ADMIN_HOST' => $this->option('admin-host'),
+            'CADDY_SERVER_FRANKENPHP_OPTIONS' => $this->workerCount() == 0 && app()->environment('local') ? '' : 'import worker',
             'CADDY_SERVER_LOG_LEVEL' => $this->option('log-level') ?: (app()->environment('local') ? 'INFO' : 'WARN'),
             'CADDY_SERVER_LOGGER' => 'json',
             'CADDY_SERVER_SERVER_NAME' => $serverName,

diff --git a/src/Commands/stubs/Caddyfile b/src/Commands/stubs/Caddyfile
@@ -1,10 +1,14 @@
+(worker) {
+	worker "{$APP_PUBLIC_PATH}/frankenphp-worker.php" {$CADDY_SERVER_WORKER_COUNT}
+}
+
 {
 	{$CADDY_GLOBAL_OPTIONS}
 
 	admin {$CADDY_SERVER_ADMIN_HOST}:{$CADDY_SERVER_ADMIN_PORT}
 
 	frankenphp {
-		worker "{$APP_PUBLIC_PATH}/frankenphp-worker.php" {$CADDY_SERVER_WORKER_COUNT}
+		{$CADDY_SERVER_FRANKENPHP_OPTIONS}
 	}
 }
 
@@ -31,7 +35,8 @@
 		{$CADDY_SERVER_EXTRA_DIRECTIVES}
 
 		php_server {
-			index frankenphp-worker.php
+			index {$APP_INDEX_FILE}
+
 			# Required for the public/storage/ directory...
 			resolve_root_symlink
 		}