Skip to content

Commit 8f7b026

Browse files
feat: Add quick installation for PHP extension pcntl (#9119)
1 parent fabf33a commit 8f7b026

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

agent/app/service/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ func (r *RuntimeService) GetPHPExtensions(runtimeID uint) (response.PHPExtension
682682
}
683683
}
684684
var phpExtensions []response.SupportExtension
685-
if err = json.Unmarshal(nginx_conf.PHPExtensionsJson, &phpExtensions); err != nil {
685+
if err = json.Unmarshal(nginx_conf.GetWebsiteFile("php_extensions.json"), &phpExtensions); err != nil {
686686
return res, err
687687
}
688688
for _, ext := range phpExtensions {

agent/app/service/runtime_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ func unInstallPHPExtension(runtime *model.Runtime, delExtensions []string) error
657657
dir := runtime.GetPath()
658658
fileOP := files.NewFileOp()
659659
var phpExtensions []response.SupportExtension
660-
if err := json.Unmarshal(nginx_conf.PHPExtensionsJson, &phpExtensions); err != nil {
660+
if err := json.Unmarshal(nginx_conf.GetWebsiteFile("php_extensions.json"), &phpExtensions); err != nil {
661661
return err
662662
}
663663
phpVersion := getRuntimeEnv(runtime.Env, "PHP_VERSION")

agent/cmd/server/nginx_conf/nginx_conf.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package nginx_conf
33
import (
44
"embed"
55
_ "embed"
6+
"io"
67
)
78

89
//go:embed ssl.conf
@@ -44,8 +45,18 @@ var PathAuth []byte
4445
//go:embed upstream.conf
4546
var Upstream []byte
4647

47-
//go:embed php_extensions.json
48-
var PHPExtensionsJson []byte
49-
5048
//go:embed sse.conf
5149
var SSE []byte
50+
51+
//go:embed *.json
52+
var websitesFiles embed.FS
53+
54+
func GetWebsiteFile(filename string) []byte {
55+
file, err := websitesFiles.Open(filename)
56+
if err != nil {
57+
return nil
58+
}
59+
defer file.Close()
60+
res, _ := io.ReadAll(file)
61+
return res
62+
}

agent/cmd/server/nginx_conf/php_extensions.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,5 +369,12 @@
369369
"file": "bcmath.so",
370370
"versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"],
371371
"installed": false
372+
},
373+
{
374+
"name": "pcntl",
375+
"check": "pcntl",
376+
"file": "pcntl.so",
377+
"versions": ["56","70", "71", "72", "73", "74", "80", "81", "82", "83","84"],
378+
"installed": false
372379
}
373380
]

0 commit comments

Comments
 (0)