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
@@ -2306,13 +2306,13 @@ conf_reload (struct ctlio *io)
   io->code = 200;
   io->output.reply = json_reply_create ();
 
   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",
 			      "configuration syntax error");
     }
   else
diff --git a/src/pies.c b/src/pies.c
index 21d3421..c52b00b 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -1566,13 +1566,12 @@ config_help (void)
 int
 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)
     {
       struct config_file *file = ep->data;
       if (file->syntax->parser (file->name))
@@ -1584,12 +1583,19 @@ pies_read_config (void)
   
   if (err)
     component_config_rollback ();
   
   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];
 
 #include "cmdline.h"
 
 
@@ -2236,13 +2242,13 @@ main (int argc, char **argv)
 	      logmsg (LOG_INFO, _("restart command ignored"));
 	      action = ACTION_CONT;
 	    }
 	  break;
 
 	case ACTION_RELOAD:
-	  if (pies_read_config ())
+	  if (pies_reread_config ())
 	    {
 	      action = ACTION_CONT;
 	      break;
 	    }
 	  /* fall through */
 	case ACTION_COMMIT:
diff --git a/src/pies.h b/src/pies.h
index 37eb4ba..c858932 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -326,12 +326,13 @@ void free_action (struct action *act);
 #define PIES_CHLD_GC               0x04
 #define PIES_CHLD_RESCHEDULE_ALARM 0x08
 
 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);
 void progman_start (void);
 void progman_gc (void);
 void progman_wake_sleeping (int);