aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ctl.c2
-rw-r--r--src/pies.c10
-rw-r--r--src/pies.h1
3 files changed, 10 insertions, 3 deletions
diff --git a/src/ctl.c b/src/ctl.c
index 2d63933..21abf59 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -2309,7 +2309,7 @@ conf_reload (struct ctlio *io)
saved_diag_fun = grecs_print_diag_fun;
grecs_print_diag_fun = reload_diag_fun;
messages = json_new_array ();
- if (pies_read_config ())
+ if (pies_reread_config ())
{
json_object_set_string (io->output.reply, "status", "ER");
json_object_set_string (io->output.reply, "error_message",
diff --git a/src/pies.c b/src/pies.c
index 21d3421..c52b00b 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1569,7 +1569,6 @@ pies_read_config (void)
struct grecs_list_entry *ep;
int err = 0;
- logmsg (LOG_INFO, _("reading configuration"));
component_config_begin ();
for (ep = config_list->head; ep; ep = ep->next)
@@ -1587,6 +1586,13 @@ pies_read_config (void)
return err;
}
+
+int
+pies_reread_config (void)
+{
+ logmsg (LOG_INFO, _("reading configuration"));
+ return pies_read_config ();
+}
static struct config_syntax *current_syntax = &config_syntax_tab[CONF_PIES];
@@ -2239,7 +2245,7 @@ main (int argc, char **argv)
break;
case ACTION_RELOAD:
- if (pies_read_config ())
+ if (pies_reread_config ())
{
action = ACTION_CONT;
break;
diff --git a/src/pies.h b/src/pies.h
index 37eb4ba..c858932 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -329,6 +329,7 @@ void free_action (struct action *act);
void pies_schedule_children (int op);
int pies_read_config (void);
+int pies_reread_config (void);
void register_prog (struct component *comp);
int progman_waiting_p (void);

Return to:

Send suggestions and report system problems to the System administrator.