diff --git a/src/Commands/Concerns/InteractsWithIO.php b/src/Commands/Concerns/InteractsWithIO.php index 8e95c6f67..1c237c8c0 100644 --- a/src/Commands/Concerns/InteractsWithIO.php +++ b/src/Commands/Concerns/InteractsWithIO.php @@ -36,6 +36,7 @@ trait InteractsWithIO '[INFO] RoadRunner server started; version:', '[INFO] sdnotify: not notified', 'exiting; byeee!!', + 'storage cleaning happened too recently', ]; /** diff --git a/src/Commands/StartFrankenPhpCommand.php b/src/Commands/StartFrankenPhpCommand.php index ce03115cc..041559b2c 100644 --- a/src/Commands/StartFrankenPhpCommand.php +++ b/src/Commands/StartFrankenPhpCommand.php @@ -71,6 +71,11 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve $this->forgetEnvironmentVariables(); $host = $this->option('host'); + $port = $this->getPort(); + + $serverName = $this->option('https') + ? "https://$host:$port" + : "http://:$port"; $process = tap(new Process([ $frankenphpBinary, @@ -84,7 +89,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve 'MAX_REQUESTS' => $this->option('max-requests'), 'CADDY_SERVER_LOG_LEVEL' => $this->option('log-level') ?: (app()->environment('local') ? 'INFO' : 'WARN'), 'CADDY_SERVER_LOGGER' => 'json', - 'CADDY_SERVER_SERVER_NAME' => ($this->option('https') ? 'https://' : 'http://')."$host:".$this->getPort(), + 'CADDY_SERVER_SERVER_NAME' => $serverName, 'CADDY_SERVER_WORKER_COUNT' => $this->workerCount() ?: '', 'CADDY_SERVER_EXTRA_DIRECTIVES' => $this->buildMercureConfig(), ]));