chore: remove netdata_configured_lock_dir (#19669)
Ilya Mashchenko committed
Feb 18, 2025 at 14:26 UTC
231813871abe86afda9997ae0df8657791485670
6 files changed
-8
src/daemon/buildinfo.c
-1
@@ -1532,7 +1532,6 @@ static void populate_directories(void) {
1532
build_info_set_value(BIB_DIR_PLUGINS, netdata_configured_primary_plugins_dir);
1533
build_info_set_value(BIB_DIR_WEB, netdata_configured_web_dir);
1534
build_info_set_value(BIB_DIR_LOG, netdata_configured_log_dir);
1535
- build_info_set_value(BIB_DIR_LOCK, netdata_configured_lock_dir);
1535
build_info_set_value(BIB_DIR_HOME, netdata_configured_home_dir);
1536
}
1537
src/daemon/common.h
-1
@@ -84,7 +84,6 @@ extern const char *netdata_configured_primary_plugins_dir;
84
extern const char *netdata_configured_web_dir;
85
extern const char *netdata_configured_cache_dir;
86
extern const char *netdata_configured_varlib_dir;
87
-extern const char *netdata_configured_lock_dir;
87
extern const char *netdata_configured_cloud_dir;
88
extern const char *netdata_configured_home_dir;
89
extern const char *netdata_configured_host_prefix;
src/daemon/config/netdata-conf-directories.c
-1
@@ -24,7 +24,6 @@ void netdata_conf_section_directories(void) {
24
netdata_configured_cache_dir = inicfg_get(&netdata_config, CONFIG_SECTION_DIRECTORIES, "cache", netdata_configured_cache_dir);
25
netdata_configured_varlib_dir = inicfg_get(&netdata_config, CONFIG_SECTION_DIRECTORIES, "lib", netdata_configured_varlib_dir);
26
27
- netdata_configured_lock_dir = get_varlib_subdir_from_config(netdata_configured_varlib_dir, "lock");
27
netdata_configured_cloud_dir = get_varlib_subdir_from_config(netdata_configured_varlib_dir, "cloud.d");
28
29
pluginsd_initialize_plugin_directories();
src/daemon/daemon.c
-3
@@ -77,15 +77,12 @@ static void clean_directory(const char *dirname)
77
static void prepare_required_directories(uid_t uid, gid_t gid) {
78
change_dir_ownership(netdata_configured_cache_dir, uid, gid, true);
79
change_dir_ownership(netdata_configured_varlib_dir, uid, gid, false);
80
- change_dir_ownership(netdata_configured_lock_dir, uid, gid, false);
80
change_dir_ownership(netdata_configured_log_dir, uid, gid, false);
81
change_dir_ownership(netdata_configured_cloud_dir, uid, gid, false);
82
83
char filename[FILENAME_MAX + 1];
84
snprintfz(filename, FILENAME_MAX, "%s/registry", netdata_configured_varlib_dir);
85
change_dir_ownership(filename, uid, gid, false);
87
-
88
- clean_directory(netdata_configured_lock_dir);
86
}
87
88
static int become_user(const char *username, int pid_fd) {
src/daemon/environment.c
-1
@@ -49,7 +49,6 @@ void set_environment_for_plugins_and_scripts(void) {
49
nd_setenv("NETDATA_WEB_DIR", verify_required_directory(netdata_configured_web_dir), 1);
50
nd_setenv("NETDATA_CACHE_DIR", verify_or_create_required_directory(netdata_configured_cache_dir), 1);
51
nd_setenv("NETDATA_LIB_DIR", verify_or_create_required_directory(netdata_configured_varlib_dir), 1);
52
- nd_setenv("NETDATA_LOCK_DIR", verify_or_create_required_directory(netdata_configured_lock_dir), 1);
52
nd_setenv("NETDATA_LOG_DIR", verify_or_create_required_directory(netdata_configured_log_dir), 1);
53
nd_setenv("NETDATA_HOST_PREFIX", netdata_configured_host_prefix, 1);
54
src/daemon/h2o-common.c
-1
@@ -10,7 +10,6 @@ const char *netdata_configured_primary_plugins_dir = PLUGINS_DIR;
10
const char *netdata_configured_web_dir = WEB_DIR;
11
const char *netdata_configured_cache_dir = CACHE_DIR;
12
const char *netdata_configured_varlib_dir = VARLIB_DIR;
13
-const char *netdata_configured_lock_dir = VARLIB_DIR "/lock";
13
const char *netdata_configured_cloud_dir = VARLIB_DIR "/cloud.d";
14
const char *netdata_configured_home_dir = VARLIB_DIR;
15
const char *netdata_configured_host_prefix = NULL;