Merge pull request #156 from SkyAPM/develop

change sock path

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
 ```
 
 

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` 可查看帮助信息
 
 

php.ini

@@ -11,4 +11,4 @@
 skywalking.app_code = hello_skywalking
 skywalking.enable = 0
 skywalking.version = 6
-skywalking.sock_path = /tmp/sky_agent.sock
+skywalking.sock_path = /var/run/sky-agent.sock
\ No newline at end of file

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";
 }
 
 
@@ -991,8 +991,12 @@ static void write_log(char *text) {
             if (conn >= 0) {
                 sprintf(message, "1%s\n", text);
                 write(fd, message, strlen(message));
+            } else {
+                php_error_docref(NULL, E_WARNING, "[skywalking] failed to connect the sock.");
             }
             close(fd);
+        } else {
+            php_error_docref(NULL, E_WARNING, "[skywalking] failed to open the sock.");
         }
         efree(message);
         efree(text);
@@ -1540,9 +1544,13 @@ static int sky_register() {
                     application_instance = atoi(ids[1]);
                     strncpy(application_uuid, ids[2], sizeof application_uuid - 1);
                 }
+            } else {
+                php_error_docref(NULL, E_WARNING, "[skywalking] failed to connect the sock.");
             }
 
             close(fd);
+        } else {
+            php_error_docref(NULL, E_WARNING, "[skywalking] failed to open the sock.");
         }
     }
     return 0;

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},
 	}
 

src/agent/service/agent.go

@@ -61,6 +61,7 @@ func (t *Agent) Run() {
 	t.connGRPC()
 	t.listenSocket()
 
+	log.Info("🍺 skywalking php agent started successfully, enjoy yourself")
 	defer func() {
 		var err error
 		err = t.socketListener.Close()