From 674b61cfc4fc76ab8ecb7542d0dcc1edb935a4c0 Mon Sep 17 00:00:00 2001 From: heyanlong Date: Fri, 1 Nov 2019 10:48:52 +0800 Subject: [PATCH] change sock path --- docs/zh/install-sdk.md | 4 ++-- docs/zh/start-agent.md | 4 ++-- php.ini | 2 +- skywalking.c | 4 ++-- src/agent/cmd/main.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/zh/install-sdk.md b/docs/zh/install-sdk.md index a6f1288..2f4ea4e 100644 --- a/docs/zh/install-sdk.md +++ b/docs/zh/install-sdk.md @@ -51,8 +51,8 @@ skywalking.enable=1 skywalking.version=6 ; app_code代码，不要含特殊字符，请使用数字、字母、下换线。(默认为：hello_skywalking) skywalking.app_code=hello_skywalking -; sock文件路径（默认值为/tmp/sky-agent.sock） -skywalking.sock_path=/tmp/sky-agent.sock +; sock文件路径（默认值为/var/run/sky-agent.sock） +skywalking.sock_path=/var/run/sky-agent.sock ``` diff --git a/docs/zh/start-agent.md b/docs/zh/start-agent.md index f3b531e..93c686f 100644 --- a/docs/zh/start-agent.md +++ b/docs/zh/start-agent.md @@ -22,14 +22,14 @@ sky-php-agent-linux-arm86 sudo chmod +x ./sky-php-agent-linux-x64 # 启动 -./sky-php-agent-linux-x64 127.0.0.1:11800 /tmp/sky_agent.sock +./sky-php-agent-linux-x64 127.0.0.1:11800 /var/run/sky-agent.sock ``` 3.agent 参数说明 * 第一个参数为SkyWalking服务端的GRPC地址 - * 第二个参数为sock文件的绝对路径，必须与php中skywalking.sock_path的路径一致。默认值为：`/tmp/sky_agent.sock` + * 第二个参数为sock文件的绝对路径，必须与php中skywalking.sock_path的路径一致。默认值为：`/var/run/sky-agent.sock` * `-h` 可查看帮助信息 diff --git a/php.ini b/php.ini index 686214d..8f9fb73 100644 --- a/php.ini +++ b/php.ini @@ -11,4 +11,4 @@ skywalking.app_code = hello_skywalking skywalking.enable = 0 skywalking.version = 6 -skywalking.sock_path = /tmp/sky_agent.sock \ No newline at end of file +skywalking.sock_path = /var/run/sky-agent.sock \ No newline at end of file diff --git a/skywalking.c b/skywalking.c index 943ac98..bbc2df8 100644 --- a/skywalking.c +++ b/skywalking.c @@ -86,7 +86,7 @@ PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("skywalking.enable", "0", PHP_INI_ALL, OnUpdateBool, enable, zend_skywalking_globals, skywalking_globals) STD_PHP_INI_ENTRY("skywalking.version", "6", PHP_INI_ALL, OnUpdateLong, version, zend_skywalking_globals, skywalking_globals) STD_PHP_INI_ENTRY("skywalking.app_code", "hello_skywalking", PHP_INI_ALL, OnUpdateString, app_code, zend_skywalking_globals, skywalking_globals) - STD_PHP_INI_ENTRY("skywalking.sock_path", "/tmp/sky-agent.sock", PHP_INI_ALL, OnUpdateString, sock_path, zend_skywalking_globals, skywalking_globals) + STD_PHP_INI_ENTRY("skywalking.sock_path", "/var/run/sky-agent.sock", PHP_INI_ALL, OnUpdateString, sock_path, zend_skywalking_globals, skywalking_globals) PHP_INI_END() /* }}} */ @@ -938,7 +938,7 @@ static void php_skywalking_init_globals(zend_skywalking_globals *skywalking_glob skywalking_globals->app_code = NULL; skywalking_globals->enable = 0; skywalking_globals->version = 6; - skywalking_globals->sock_path = "/tmp/sky_agent.sock"; + skywalking_globals->sock_path = "/var/run/sky-agent.sock"; } diff --git a/src/agent/cmd/main.go b/src/agent/cmd/main.go index b5855e6..33e189e 100644 --- a/src/agent/cmd/main.go +++ b/src/agent/cmd/main.go @@ -22,7 +22,7 @@ func main() { app.Usage = "the skywalking trace sending agent" app.Flags = []cli.Flag{ cli.StringFlag{Name: "grpc", Usage: "SkyWalking collector grpc address", Value: "127.0.0.1:11800"}, - cli.StringFlag{Name: "socket", Usage: "Pipeline for communicating with PHP", Value: "/tmp/sky-agent.sock"}, + cli.StringFlag{Name: "socket", Usage: "Pipeline for communicating with PHP", Value: "/var/run/sky-agent.sock"}, cli.IntFlag{Name: "send-rate", Usage: "Send trace 1 second by default", Value: 1}, } -- GitLab