external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #1635, inotify watch ConfigMap for reload. 3.0.132

Browse source
This commit is contained in:
winlin 2020-03-12 21:58:29 +08:00
parent 940798a9c7
commit 88368ed18d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_server.cpp
View file

@ -539,7 +539,7 @@ srs_error_t SrsInotifyWorker::start()
// Watch the config directory events. // Watch the config directory events.
string config_dir = srs_path_dirname(_srs_config->config()); string config_dir = srs_path_dirname(_srs_config->config());
if (true) { if (true) {
uint32_t mask = IN_MODIFY | IN_CREATE; uint32_t mask = IN_ALL_EVENTS;
if (::inotify_add_watch(fd, config_dir.c_str(), mask) < 0) { if (::inotify_add_watch(fd, config_dir.c_str(), mask) < 0) {
return srs_error_new(ERROR_INOTIFY_WATCH, "watch file=%s, fd=%d, mask=%#x", config_dir.c_str(), fd, mask); return srs_error_new(ERROR_INOTIFY_WATCH, "watch file=%s, fd=%d, mask=%#x", config_dir.c_str(), fd, mask);
} }
@ -549,7 +549,7 @@ srs_error_t SrsInotifyWorker::start()
// Watch k8s sub directory. // Watch k8s sub directory.
string k8s_file = config_dir + "/..data"; string k8s_file = config_dir + "/..data";
if (srs_path_exists(k8s_file)) { if (srs_path_exists(k8s_file)) {
uint32_t mask = IN_MODIFY; uint32_t mask = IN_ALL_EVENTS;
if (::inotify_add_watch(fd, k8s_file.c_str(), mask) < 0) { if (::inotify_add_watch(fd, k8s_file.c_str(), mask) < 0) {
return srs_error_new(ERROR_INOTIFY_WATCH, "watch file=%s, fd=%d, mask=%#x", k8s_file.c_str(), fd, mask); return srs_error_new(ERROR_INOTIFY_WATCH, "watch file=%s, fd=%d, mask=%#x", k8s_file.c_str(), fd, mask);
} }
@ -601,7 +601,7 @@ srs_error_t SrsInotifyWorker::cycle()
// Notify server to do reload. // Notify server to do reload.
if (do_reload && srs_path_exists(config_path)) { if (do_reload && srs_path_exists(config_path)) {
server->on_signal(SRS_SIGNAL_RELOAD); //server->on_signal(SRS_SIGNAL_RELOAD);
} }
srs_usleep(3000 * SRS_UTIME_MILLISECONDS); srs_usleep(3000 * SRS_UTIME_MILLISECONDS);

2
trunk/src/core/srs_core_version3.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION3_HPP #ifndef SRS_CORE_VERSION3_HPP
#define SRS_CORE_VERSION3_HPP #define SRS_CORE_VERSION3_HPP
#define SRS_VERSION3_REVISION 131 #define SRS_VERSION3_REVISION 132
#endif #endif