external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 20:31:56 +00:00
Code Issues Releases Wiki Activity

For #1635, inotify watch ConfigMap for reload. 3.0.133

Browse source
This commit is contained in:
winlin 2020-03-12 22:08:23 +08:00
parent 88368ed18d
commit bb509d23e2
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -466,6 +466,7 @@ SrsInotifyWorker::SrsInotifyWorker(SrsServer* s)
server = s; server = s;
trd = new SrsSTCoroutine("inotify", this); trd = new SrsSTCoroutine("inotify", this);
inotify_fd = NULL; inotify_fd = NULL;
watch_conf = watch_k8s = 0;
} }
SrsInotifyWorker::~SrsInotifyWorker() SrsInotifyWorker::~SrsInotifyWorker()
@ -540,20 +541,22 @@ srs_error_t SrsInotifyWorker::start()
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_ALL_EVENTS; uint32_t mask = IN_ALL_EVENTS;
if (::inotify_add_watch(fd, config_dir.c_str(), mask) < 0) { if ((watch_conf = ::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, watch=%d, mask=%#x",
config_dir.c_str(), fd, watch_conf, mask);
} }
srs_trace("auto reload watching fd=%d, file=%s", fd, config_dir.c_str()); srs_trace("auto reload watching fd=%d, watch=%d, file=%s", fd, watch_conf, config_dir.c_str());
} }
// 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_ALL_EVENTS; uint32_t mask = IN_ALL_EVENTS;
if (::inotify_add_watch(fd, k8s_file.c_str(), mask) < 0) { if ((watch_k8s = ::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, watch=%d, mask=%#x",
k8s_file.c_str(), fd, watch_k8s, mask);
} }
srs_trace("auto reload watching fd=%d, file=%s", fd, k8s_file.c_str()); srs_trace("auto reload watching fd=%d, watch=%d, file=%s", fd, watch_k8s, k8s_file.c_str());
} }
if ((err = trd->start()) != srs_success) { if ((err = trd->start()) != srs_success) {
@ -587,14 +590,14 @@ srs_error_t SrsInotifyWorker::cycle()
for (char* ptr = buf; ptr < buf + nn; ptr += sizeof(inotify_event) + ie->len) { for (char* ptr = buf; ptr < buf + nn; ptr += sizeof(inotify_event) + ie->len) {
ie = (inotify_event*)ptr; ie = (inotify_event*)ptr;
if (!ie->len || !ie->name) { //if (!ie->len || !ie->name) {
continue; // continue;
} //}
//
string name = ie->name; //string name = ie->name;
if ((name == k8s_file || name == config_file) && ie->mask & (IN_MODIFY|IN_CREATE)) { //if ((name == k8s_file || name == config_file) && ie->mask & (IN_MODIFY|IN_CREATE)) {
do_reload = true; // do_reload = true;
} //}
srs_trace("inotify event wd=%d, mask=%#x, len=%d, name=%s, reload=%d", ie->wd, ie->mask, ie->len, ie->name, do_reload); srs_trace("inotify event wd=%d, mask=%#x, len=%d, name=%s, reload=%d", ie->wd, ie->mask, ie->len, ie->name, do_reload);
} }

2
trunk/src/app/srs_app_server.hpp
View file

@ -192,6 +192,8 @@ private:
SrsServer* server; SrsServer* server;
SrsCoroutine* trd; SrsCoroutine* trd;
srs_netfd_t inotify_fd; srs_netfd_t inotify_fd;
int watch_conf;
int watch_k8s;
public: public:
SrsInotifyWorker(SrsServer* s); SrsInotifyWorker(SrsServer* s);
virtual ~SrsInotifyWorker(); virtual ~SrsInotifyWorker();

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 132 #define SRS_VERSION3_REVISION 133
#endif #endif