提交 187cab1e 编写于 作者: X xionglei6

init: fix bugs

Signed-off-by: Nxionglei6 <xionglei6@huawei.com>
上级 76b58269
......@@ -289,12 +289,6 @@ int ServiceStart(Service *service)
DoJobNow(service->serviceJobs.jobsName[JOB_ON_START]);
}
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGCHLD);
sigaddset(&mask, SIGTERM);
sigprocmask(SIG_UNBLOCK, &mask, NULL);
if (!IsOnDemandService(service)) {
int ret = CreateServiceSocket(service);
INIT_ERROR_CHECK(ret >= 0, return SERVICE_FAILURE,
......
......@@ -79,7 +79,7 @@ LE_STATUS LE_AddSignal(const LoopHandle loopHandle, const SignalHandle signalHan
}
sigaddset(&task->mask, signal);
sigprocmask(SIG_BLOCK, &task->mask, NULL);
int sfd = signalfd(GetSocketFd(signalHandle), &task->mask, SFD_NONBLOCK);
int sfd = signalfd(GetSocketFd(signalHandle), &task->mask, SFD_NONBLOCK | SFD_CLOEXEC);
LE_CHECK(sfd > 0, return -1, "Failed to create signal fd");
if (task->sigNumber == 0) {
loop->addEvent(loop, (const BaseTask *)task, Event_Read);
......@@ -113,4 +113,4 @@ void LE_CloseSignalTask(const LoopHandle loopHandle, const SignalHandle signalHa
{
LE_CHECK(loopHandle != NULL && signalHandle != NULL, return, "Invalid parameters");
LE_CloseTask(loopHandle, signalHandle);
}
\ No newline at end of file
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册