@@ -211,6 +211,16 @@ func startupLogAttrs(frankenPHPVersion string, phpVersion string, numThreads int
211211 return append (attrs , slog .String (startupLogAttrPHPVersion , phpVersion ), slog .Int (startupLogAttrNumThreads , numThreads ), slog .Int (startupLogAttrMaxThreads , maxThreads ), slog .Int (startupLogAttrMaxRequests , maxRequests ))
212212}
213213
214+ func startupLogAttrsWithVersion (logger * slog.Logger , phpVersion string , numThreads int , maxThreads int , maxRequests int , versionFunc func () (string , error )) []slog.Attr {
215+ frankenPHPVersion , err := versionFunc ()
216+ if err != nil {
217+ logger .LogAttrs (globalCtx , slog .LevelDebug , startupLogVersionUnavailableMessage , slog .Any (startupLogAttrError , err ))
218+ frankenPHPVersion = ""
219+ }
220+
221+ return startupLogAttrs (frankenPHPVersion , phpVersion , numThreads , maxThreads , maxRequests )
222+ }
223+
214224func Config () PHPConfig {
215225 cConfig := C .frankenphp_get_config ()
216226
@@ -408,13 +418,7 @@ func Init(options ...Option) error {
408418 initAutoScaling (mainThread )
409419
410420 if globalLogger .Enabled (globalCtx , slog .LevelInfo ) {
411- frankenPHPBuildVersion := ""
412- if version , err := frankenPHPVersion (); err != nil {
413- globalLogger .LogAttrs (globalCtx , slog .LevelDebug , startupLogVersionUnavailableMessage , slog .Any (startupLogAttrError , err ))
414- } else {
415- frankenPHPBuildVersion = version
416- }
417- globalLogger .LogAttrs (globalCtx , slog .LevelInfo , startupLogMessage , startupLogAttrs (frankenPHPBuildVersion , Version ().Version , mainThread .numThreads , mainThread .maxThreads , maxRequestsPerThread )... )
421+ globalLogger .LogAttrs (globalCtx , slog .LevelInfo , startupLogMessage , startupLogAttrsWithVersion (globalLogger , Version ().Version , mainThread .numThreads , mainThread .maxThreads , maxRequestsPerThread , frankenPHPVersion )... )
418422
419423 if EmbeddedAppPath != "" {
420424 globalLogger .LogAttrs (globalCtx , slog .LevelInfo , "embedded PHP app 📦" , slog .String ("path" , EmbeddedAppPath ))
0 commit comments