summaryrefslogtreecommitdiffstats
path: root/src/daemon/abrt_conf.c
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-04-20 14:38:54 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2011-04-20 14:38:54 +0200
commit3572f658c5829492da1c99eae33b1e9ca9d4518c (patch)
treec1fd709df852246ccf7d5320775f9f65945f7c79 /src/daemon/abrt_conf.c
parent6523896fd4f45ab6672e0eee007ce1bb6757eba4 (diff)
downloadabrt-3572f658c5829492da1c99eae33b1e9ca9d4518c.tar.gz
abrt-3572f658c5829492da1c99eae33b1e9ca9d4518c.tar.xz
abrt-3572f658c5829492da1c99eae33b1e9ca9d4518c.zip
daemon: reload abrt.conf after each poll. Closes 189
Can be optimized a bit by checking stat.st_mtime. Currently, every reload looks like this: 14:37:49.551073 open("/etc/abrt/abrt.conf", O_RDONLY) = 13 14:37:49.551229 fstat(13, {st_mode=S_IFREG|0644, st_size=869, ...}) = 0 14:37:49.551393 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f541037f000 14:37:49.551505 read(13, "# With this option set to \"yes\",\n# only crashes in signed packages will be analyzed.\n# the list of "..., 4096) = 869 14:37:49.551709 read(13, "", 4096) = 0 14:37:49.551812 close(13) = 0 14:37:49.552051 open("/etc/abrt/gpg_keys", O_RDONLY) = 13 14:37:49.552183 fstat(13, {st_mode=S_IFREG|0644, st_size=36, ...}) = 0 14:37:49.552338 mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f541037f000 14:37:49.552448 read(13, "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora\n", 4096) = 36 14:37:49.552591 read(13, "", 4096) = 0 14:37:49.552692 close(13) = 0 14:37:49.552792 munmap(0x7f541037f000, 4096) = 0 Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/daemon/abrt_conf.c')
-rw-r--r--src/daemon/abrt_conf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/abrt_conf.c b/src/daemon/abrt_conf.c
index 0eb83fbe..46d8f44c 100644
--- a/src/daemon/abrt_conf.c
+++ b/src/daemon/abrt_conf.c
@@ -28,7 +28,7 @@ unsigned int g_settings_nMaxCrashReportsSize = 1000;
bool g_settings_bProcessUnpackaged = false;
-void free_settings()
+void free_abrt_conf_data()
{
list_free_with_free(g_settings_setOpenGPGPublicKeys);
g_settings_setOpenGPGPublicKeys = NULL;
@@ -108,7 +108,7 @@ static void ParseCommon(map_string_h *settings, const char *conf_filename)
value = g_hash_table_lookup(settings, "MaxCrashReportsSize");
if (value)
{
-//fixme: dont die
+//FIXME: dont die
g_settings_nMaxCrashReportsSize = xatoi_positive(value);
g_hash_table_remove(settings, "MaxCrashReportsSize");
}
@@ -150,9 +150,9 @@ static void LoadGPGKeys()
}
}
-int load_settings()
+int load_abrt_conf()
{
- free_settings();
+ free_abrt_conf_data();
map_string_h *settings = new_map_string();
if (!load_conf_file(CONF_DIR"/abrt.conf", settings, /*skip key w/o values:*/ false))