haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-17 15:50:07 +00:00
Code Issues Releases Wiki Activity

use nonblock pipe (#392)

Browse Source
This commit is contained in:
Xiangyue Cai
2020-08-24 18:23:05 +08:00
committed by GitHub
parent 3520282c22
commit 17198b7527
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controller/seafile-controller.c
View File

@@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <stdbool.h> #include <stdbool.h>
#include <fcntl.h>
#include <glib.h> #include <glib.h>
#include <ccnet.h> #include <ccnet.h>
@@ -85,6 +86,7 @@ spawn_process (char *argv[], bool is_python_process)
if (pipe(pipefd) < 0) { if (pipe(pipefd) < 0) {
seaf_warning("Failed to create pipe.\n"); seaf_warning("Failed to create pipe.\n");
} }
fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
} }
pid_t pid = fork(); pid_t pid = fork();
@@ -116,6 +118,7 @@ spawn_process (char *argv[], bool is_python_process)
char child_stderr[1024] = {0}; char child_stderr[1024] = {0};
if (pipefd[0] > 0 && pipefd[1] > 0){ if (pipefd[0] > 0 && pipefd[1] > 0){
close(pipefd[1]); close(pipefd[1]);
sleep(1);
while (read(pipefd[0], child_stderr, sizeof(child_stderr)) > 0) while (read(pipefd[0], child_stderr, sizeof(child_stderr)) > 0)
seaf_warning("%s", child_stderr); seaf_warning("%s", child_stderr);
close(pipefd[0]); close(pipefd[0]);