diff --git a/server/Process.cpp b/server/Process.cpp index 3a376eed..738754a0 100644 --- a/server/Process.cpp +++ b/server/Process.cpp @@ -44,6 +44,11 @@ void Process::run(const string &cmd, const string &log_file_tmp) { } if (_pid == 0) { //子进程 + + //子进程关闭core文件生成 + struct rlimit rlim = {0,0}; + setrlimit(RLIMIT_CORE, &rlim); + // ignore the SIGINT and SIGTERM signal(SIGINT, SIG_IGN); signal(SIGTERM, SIG_IGN); diff --git a/server/WebHook.h b/server/WebHook.h new file mode 100644 index 00000000..847c5d73 --- /dev/null +++ b/server/WebHook.h @@ -0,0 +1,38 @@ +/* + * MIT License + * + * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com> + * + * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef ZLMEDIAKIT_WEBHOOK_H +#define ZLMEDIAKIT_WEBHOOK_H + +#include +using namespace std; + +namespace Hook { +extern const string kTimeoutSec; +}//namespace Hook + + +#endif //ZLMEDIAKIT_WEBHOOK_H