apache · bneradt · Jul 13, 2022
@@ -1809,10 +1809,6 @@ AC_LANG_POP([C++])
 # Right now, the healthcheck plugins requires inotify_init (and friends)
 AM_CONDITIONAL([BUILD_HEALTHCHECK_PLUGIN], [ test "$ac_cv_func_inotify_init" = "yes" ])
 
-use_inotify=0
-AS_IF([test "x$ac_cv_func_inotify_init" = "xyes"], [use_inotify=1])
-AC_SUBST(use_inotify)
-
 #
 # Check for tcmalloc, jemalloc and mimalloc
 TS_CHECK_TCMALLOC
@@ -2257,8 +2253,7 @@ iocore_include_dirs="\
 -I\$(abs_top_srcdir)/iocore/hostdb \
 -I\$(abs_top_srcdir)/iocore/cache \
 -I\$(abs_top_srcdir)/iocore/utils \
--I\$(abs_top_srcdir)/iocore/dns \
--I\$(abs_top_srcdir)/iocore/fs"
+-I\$(abs_top_srcdir)/iocore/dns"
 
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
@@ -2306,7 +2301,6 @@ AC_CONFIG_FILES([
   iocore/cache/Makefile
   iocore/dns/Makefile
   iocore/eventsystem/Makefile
-  iocore/fs/Makefile
   iocore/hostdb/Makefile
   iocore/net/Makefile
   iocore/net/quic/Makefile

@@ -44,7 +44,7 @@ Alternatively, you can store the access key and secret in an external configurat
 
    # remap.config
 
-   ...  @plugin=s3_auth.so @pparam=--config @pparam=s3_auth_v2.config @pparam=--watch-config @pparam=--ttl=5
+   ...  @plugin=s3_auth.so @pparam=--config @pparam=s3_auth_v2.config
 
 
 Where ``s3.config`` could look like::
@@ -94,8 +94,6 @@ The ``s3_auth_v4.config`` config file could look like this::
     v4-include-headers=<comma-separated-list-of-headers-to-be-signed>
     v4-exclude-headers=<comma-separated-list-of-headers-not-to-be-signed>
     v4-region-map=region_map.config
-    watch-config
-    ttl=20
 
 Where the ``region_map.config`` defines the entry-point hostname to region mapping i.e.::
 
@@ -125,10 +123,6 @@ If ``--v4-include-headers`` is not specified all headers except those specified
 
 If ``--v4-include-headers`` is specified only the headers specified will be signed except those specified in ``--v4-exclude-headers``
 
-If ``--watch-config`` is specified, the plugin will reload the config file set in ``--config`` when it changes
-
-If ``--ttl`` is specified, the plugin will cache configs for the specified number of seconds.  During the ttl period, manual config reloads and ``--watch-config`` will not cause the config to be updated.  The default is 60 seconds.  Setting ttl to zero causes all reloads to read from the config file.  This option is useful if the config file is fetched from a service, and you wish to limit the fetch rate.
-
 
 AWS Authentication version 2
 ============================

@@ -262,7 +262,6 @@ Condition Testing
         - TS_HAS_128BIT_CAS
         - TS_HAS_TESTS
         - TS_HAS_WCCP
-        - TS_USE_INOTIFY
 
 
 Examples:

@@ -554,11 +554,6 @@ typedef enum {
   TS_EVENT_SSL_CLIENT_HELLO  = 60207,
   TS_EVENT_SSL_SECRET        = 60208,
 
-  TS_EVENT_FILE_CREATED = 60300,
-  TS_EVENT_FILE_UPDATED = 60301,
-  TS_EVENT_FILE_DELETED = 60302,
-  TS_EVENT_FILE_IGNORED = 60303,
-
   TS_EVENT_MGMT_UPDATE = 60300
 } TSEvent;
 #define TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP TS_EVENT_HTTP_PRE_REMAP /* backwards compat */
@@ -1459,13 +1454,6 @@ namespace ts
 }
 #endif
 
-typedef int TSWatchDescriptor;
-typedef enum { TS_WATCH_CREATE, TS_WATCH_DELETE, TS_WATCH_MODIFY } TSFileWatchKind;
-typedef struct {
-  TSWatchDescriptor wd;
-  const char *name;
-} TSFileWatchData;
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -2720,23 +2720,6 @@ tsapi void TSHostStatusSet(const char *hostname, const size_t hostname_len, TSHo
 tsapi bool TSHttpTxnCntlGet(TSHttpTxn txnp, TSHttpCntlType ctrl);
 tsapi TSReturnCode TSHttpTxnCntlSet(TSHttpTxn txnp, TSHttpCntlType ctrl, bool data);
 
-/*
- * Get notified for file system events
- *
- * Currently, this only works in Linux using inotify.
- *
- * TODO: Fix multiple plugins watching the same path.
- *
- * The edata (a.k.a. cookie) field of the continuation handler will contain information
- * depending on the type of file event.  edata is always a pointer to a TSFileWatchData.
- * If the event is TS_EVENT_FILE_CREATED, name is a pointer to a null-terminated string
- * containing the file name.  Otherwise, name is a nullptr.  wd is the watch descriptor
- * for the event.
- *
- */
-tsapi TSWatchDescriptor TSFileEventRegister(const char *filename, TSFileWatchKind kind, TSCont contp);
-tsapi void TSFileEventUnRegister(TSWatchDescriptor wd);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/include/tscore/ink_config.h.in b/include/tscore/ink_config.h.in
@@ -83,7 +83,6 @@
 #define TS_HAS_TLS_EARLY_DATA @has_tls_early_data@
 #define TS_HAS_TLS_SESSION_TICKET @has_tls_session_ticket@
 #define TS_HAS_VERIFY_CERT_STORE @has_verify_cert_store@
-#define TS_USE_INOTIFY @use_inotify@
 
 #define TS_USE_HRW_GEOIP @use_hrw_geoip@
 #define TS_USE_HRW_MAXMINDDB @use_hrw_maxminddb@

@@ -16,4 +16,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = eventsystem net aio dns hostdb utils cache fs
+SUBDIRS = eventsystem net aio dns hostdb utils cache