diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-28 14:48:25 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-28 14:48:25 +0200 |
| commit | c9da511cf0cf93efc9a9d8578ef1e0924ccee33c (patch) | |
| tree | 549a8e65cfdb30a04e62f680a54c6a60b7810fdf /nxcomp/Loop.cpp | |
| parent | a5de79181092ce829ce3878d3d9ce671c3cd3cbc (diff) | |
| parent | c7eac1f95626e376b17ccd684b2a4e9402b3c17c (diff) | |
| download | nx-libs-c9da511cf0cf93efc9a9d8578ef1e0924ccee33c.tar.gz nx-libs-c9da511cf0cf93efc9a9d8578ef1e0924ccee33c.tar.bz2 nx-libs-c9da511cf0cf93efc9a9d8578ef1e0924ccee33c.zip | |
Merge branch 'theqvd-slave-channel' into 3.6.x
Attributes GH PR #232: https://github.com/ArcticaProject/nx-libs/pull/232
Diffstat (limited to 'nxcomp/Loop.cpp')
| -rw-r--r-- | nxcomp/Loop.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 46031e70d..09ba6f952 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -359,7 +359,7 @@ static void RestoreSignal(int signal); static int HandleChildren(); -static int HandleChild(int child); +int HandleChild(int child); static int CheckChild(int pid, int status); static int WaitChild(int child, const char *label, int force); @@ -6250,6 +6250,8 @@ int HandleChildren() return 1; } + proxy->checkSlaves(); + // // This can actually happen either because we // reset the pid of the child process as soon |