utils/cache_gc: rename daemon to kres_cache_gc

diff --git a/daemon/README.rst b/daemon/README.rst
index 9b179cd2af65df8cfa7033d9892e62b6b74ecd13..8fbb5dbc5b168a8d7ceb45829871282439020f2f 100644 (file)
--- a/daemon/README.rst
+++ b/daemon/README.rst
@@ -624,13 +624,13 @@ required, the entire cache is dropped. To avoid starting over with an empty
 cache, a separate garbage collector daemon is available to periodically trim
 the cache instead.
 
-The cache garbage collector daemon (``kr_cache_gc``) monitors the cache usage
+The cache garbage collector daemon (``kres_cache_gc``) monitors the cache usage
 and attempts to free up space when a threshold is reached. To spawn the daemon
 and configure it to run every minute, use:
 
 .. code-block:: bash
 
-   $ kr_cache_gc -c /var/cache/knot-resolver -d 60000
+   $ kres_cache_gc -c /var/cache/knot-resolver -d 60000
 
 It's also possible to run this under systemd. However, a dedicated systemd unit
 is not currently part of the upstream package. See `message#167`_ on our

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index e80207f1fe8426d2c3bc497423ad03c7d1f275d3..91179e9b6d9f21f9bebad7170ebc091939b24d08 100644 (file)
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -30,4 +30,4 @@ usr/lib/knot-resolver/kres_modules/view.lua
 usr/lib/knot-resolver/kres_modules/workarounds.lua
 usr/sbin/kresc
 usr/sbin/kresd
-usr/sbin/kr_cache_gc
+usr/sbin/kres_cache_gc

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index c9f3dc475140823075870cc7dcf4421a6f787bc1..d57820405646563eebb34abfe90400151e3a2e3d 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -254,7 +254,7 @@ systemctl daemon-reload
 %attr(750,knot-resolver,knot-resolver) %dir %{_localstatedir}/cache/%{name}
 %{_sbindir}/kresd
 %{_sbindir}/kresc
-%{_sbindir}/kr_cache_gc
+%{_sbindir}/kres_cache_gc
 %{_libdir}/libkres.so.*
 %dir %{_libdir}/knot-resolver
 %{_libdir}/knot-resolver/*.so

diff --git a/utils/cache_gc/.gitignore b/utils/cache_gc/.gitignore
new file mode 100644 (file)
index 0000000..86ce5b1
--- /dev/null
+++ b/utils/cache_gc/.gitignore
@@ -0,0 +1,2 @@
+kres_cache_gc
+

diff --git a/utils/kr_cache_gc/categories.c b/utils/cache_gc/categories.c
similarity index 100%
rename from utils/kr_cache_gc/categories.c
rename to utils/cache_gc/categories.c

diff --git a/utils/kr_cache_gc/categories.h b/utils/cache_gc/categories.h
similarity index 100%
rename from utils/kr_cache_gc/categories.h
rename to utils/cache_gc/categories.h

diff --git a/utils/kr_cache_gc/db.c b/utils/cache_gc/db.c
similarity index 100%
rename from utils/kr_cache_gc/db.c
rename to utils/cache_gc/db.c

diff --git a/utils/kr_cache_gc/db.h b/utils/cache_gc/db.h
similarity index 100%
rename from utils/kr_cache_gc/db.h
rename to utils/cache_gc/db.h

diff --git a/utils/kr_cache_gc/kr_cache_gc.c b/utils/cache_gc/kr_cache_gc.c
similarity index 100%
rename from utils/kr_cache_gc/kr_cache_gc.c
rename to utils/cache_gc/kr_cache_gc.c

diff --git a/utils/kr_cache_gc/kr_cache_gc.h b/utils/cache_gc/kr_cache_gc.h
similarity index 100%
rename from utils/kr_cache_gc/kr_cache_gc.h
rename to utils/cache_gc/kr_cache_gc.h

diff --git a/utils/kr_cache_gc/main.c b/utils/cache_gc/main.c
similarity index 100%
rename from utils/kr_cache_gc/main.c
rename to utils/cache_gc/main.c

diff --git a/utils/kr_cache_gc/meson.build b/utils/cache_gc/meson.build
similarity index 65%
rename from utils/kr_cache_gc/meson.build
rename to utils/cache_gc/meson.build
index c762facee7e8ffdf72363ec6b34ceefc5fb3993d..fb27f585e3be8bc6b57d2cb2035865e832082f8a 100644 (file)
--- a/utils/kr_cache_gc/meson.build
+++ b/utils/cache_gc/meson.build
@@ -1,15 +1,15 @@
-## utils/kr_cache_gc
+## utils/cache_gc
 
-kr_cache_gc_src = files([
+cache_gc_src = files([
   'categories.c',
   'db.c',
   'kr_cache_gc.c',
   'main.c',
 ])
 
-kr_cache_gc = executable(
-  'kr_cache_gc',
-  kr_cache_gc_src,
+cache_gc = executable(
+  'kres_cache_gc',
+  cache_gc_src,
   dependencies: [
     contrib_dep,
     libkres_dep,

diff --git a/utils/kr_cache_gc/.gitignore b/utils/kr_cache_gc/.gitignore
deleted file mode 100644 (file)
index c27063b..0000000
--- a/utils/kr_cache_gc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kr_cache_gc
-

diff --git a/utils/meson.build b/utils/meson.build
index f38b51edd38d422c3133b93c9c9aff93576dd70e..74ad5e2ddede66c6be2e5f7c0af10d99ab55682b 100644 (file)
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -4,5 +4,5 @@ subdir('client')
 
 build_utils = get_option('utils') != 'disabled'
 if build_utils
-  subdir('kr_cache_gc')
+  subdir('cache_gc')
 endif