Remove reconf condition when .conf reload completes

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2017-10-12 01:07:09 +02:00
1 parent 75d29de3cc
commit 06479aa5f1
2 files changed
+9 -1

No files matched your search

+6 -1
View File
@@ -148,7 +148,12 @@ static int reassert(const char *fpath, const struct stat *sb, int tflg, struct F
*/
void cond_reassert(const char *type)
{
_d("%s", type);
_d("%s", type ?: "reload done");
if (!type) {
cond_clear(COND_RECONF);
return;
}
nftw(cond_path(type), reassert, 20, FTW_DEPTH);
}
+3
View File
@@ -230,6 +230,9 @@ restart:
_d("Calling reconf hooks ...");
plugin_run_hooks(HOOK_SVC_RECONF);
/* Done, lift reconf condition */
cond_reassert(NULL);
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_INETD);
_d("Reconfiguration done");