aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2016-02-24 08:43:42 +0200
committerSergey Poznyakoff <gray@gnu.org>2016-02-24 08:43:42 +0200
commit59e25f1ffcdf5bd4f6b8d9da92718f82bcc259b1 (patch)
treea809d02813049c6b3c73c1d8f28a82a30e8918f5
parent1f728fa1ea2ced70254debf3b6bf63b76ad90ee0 (diff)
downloadpies-59e25f1ffcdf5bd4f6b8d9da92718f82bcc259b1.tar.gz
pies-59e25f1ffcdf5bd4f6b8d9da92718f82bcc259b1.tar.bz2
Remove spurious informational message on startup
-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)
2309 saved_diag_fun = grecs_print_diag_fun; 2309 saved_diag_fun = grecs_print_diag_fun;
2310 grecs_print_diag_fun = reload_diag_fun; 2310 grecs_print_diag_fun = reload_diag_fun;
2311 messages = json_new_array (); 2311 messages = json_new_array ();
2312 if (pies_read_config ()) 2312 if (pies_reread_config ())
2313 { 2313 {
2314 json_object_set_string (io->output.reply, "status", "ER"); 2314 json_object_set_string (io->output.reply, "status", "ER");
2315 json_object_set_string (io->output.reply, "error_message", 2315 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)
1569 struct grecs_list_entry *ep; 1569 struct grecs_list_entry *ep;
1570 int err = 0; 1570 int err = 0;
1571 1571
1572 logmsg (LOG_INFO, _("reading configuration"));
1573 component_config_begin (); 1572 component_config_begin ();
1574 1573
1575 for (ep = config_list->head; ep; ep = ep->next) 1574 for (ep = config_list->head; ep; ep = ep->next)
@@ -1587,6 +1586,13 @@ pies_read_config (void)
1587 1586
1588 return err; 1587 return err;
1589} 1588}
1589
1590int
1591pies_reread_config (void)
1592{
1593 logmsg (LOG_INFO, _("reading configuration"));
1594 return pies_read_config ();
1595}
1590 1596
1591static struct config_syntax *current_syntax = &config_syntax_tab[CONF_PIES]; 1597static struct config_syntax *current_syntax = &config_syntax_tab[CONF_PIES];
1592 1598
@@ -2239,7 +2245,7 @@ main (int argc, char **argv)
2239 break; 2245 break;
2240 2246
2241 case ACTION_RELOAD: 2247 case ACTION_RELOAD:
2242 if (pies_read_config ()) 2248 if (pies_reread_config ())
2243 { 2249 {
2244 action = ACTION_CONT; 2250 action = ACTION_CONT;
2245 break; 2251 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);
329void pies_schedule_children (int op); 329void pies_schedule_children (int op);
330 330
331int pies_read_config (void); 331int pies_read_config (void);
332int pies_reread_config (void);
332 333
333void register_prog (struct component *comp); 334void register_prog (struct component *comp);
334int progman_waiting_p (void); 335int progman_waiting_p (void);

Return to:

Send suggestions and report system problems to the System administrator.