From 86891eb2e5c6571a95297a0c6660ba4248b579d9 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 5 May 2022 09:26:55 -0400 Subject: [PATCH] Rework resolv watcher Handle symlinks better and do not trigger overly eagerly --- confluent_server/confluent/sockapi.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/sockapi.py b/confluent_server/confluent/sockapi.py index 53f76ed2..341f1973 100644 --- a/confluent_server/confluent/sockapi.py +++ b/confluent_server/confluent/sockapi.py @@ -502,8 +502,17 @@ class SockApi(object): def watch_resolv(self): while True: watcher = libc.inotify_init1(os.O_NONBLOCK) - if libc.inotify_add_watch(watcher, b'/etc/resolv.conf', 0xcda) <= -1: - break + resolvpath = '/etc/resolv.conf' + while True: + try: + resolvpath = os.readlink(resolvpath) + except Exception: + break + if not isinstance(resolvpath, bytes): + resolvpath = resolvpath.encode('utf8') + if libc.inotify_add_watch(watcher, resolvpath, 0xcc2) <= -1: + eventlet.sleep(15) + continue select.select((watcher,), (), (), 86400) try: os.read(watcher, 1024)