Implement long options, running instance control and component dependency checking

git-svn-id: file:///svnroot/gsc/trunk@254 d2de0444-eb31-0410-8365-af798a554d48

1 files changed, 362 insertions, 50 deletions

diff --git a/jabberd/main.c b/jabberd/main.c
index e2a00ac..476abd8 100644
--- a/jabberd/main.c
+++ b/jabberd/main.c
@@ -28,7 +28,9 @@ char *syslog_tag = "jabberd";
 int log_facility = LOG_LOCAL7;
 int x_argc;
 char **x_argv;
-char *pidfile;
+char *pidfile = STATEDIR "/jabberd.pid";
+char *ctlfile = STATEDIR "/.jabberd.ctl";
+char *statfile = STATEDIR "/.jabberd.stat";
 unsigned long shutdown_timeout = 5;
 mode_t jabberd_umask = 037;
 
@@ -131,17 +133,27 @@ version ()
 void
 usage ()
 {
-  printf ("usage: jabberd [-Dfehv][-c config][-p pidfile]\n");
+  printf ("usage: jabberd [-Dfehv][-c config][-r tag [tag...]]\n");
   printf ("jabberd -- A dispatcher program for jabber 2.x\n");
   printf ("\n");
-  printf ("Options:\n");
-  printf ("  -c FILE     use this configuration file\n");
-  printf ("  -D          increase debugging level\n");
-  printf ("  -f          run in foreground mode (implies -e)\n");
-  printf ("  -e          use standard error for diagnostics output\n");
-  printf ("  -h          display this help list\n");
-  printf ("  -p FILE     write master process ID to FILE\n");
-  printf ("  -v          display program version\n");
+  printf ("General-purpose options:\n");
+  printf ("  -c, --config-file=FILE     use this configuration file\n");
+  printf ("  -D, --debug                increase debugging level\n");
+  printf ("  -e, --stderr               use standard error for diagnostics output\n");
+  printf ("  -f, --foreground           run in foreground mode (implies -e)\n");
+  printf ("  --force                    start up even if another copy seems to be running\n");
+  
+  printf ("\nControlling running instance:\n");
+  printf ("  --status                   display status information\n");
+  printf ("  --stop                     stop the running copy\n");
+  printf ("  --reload, --hup            reload the running copy\n");
+  printf ("  -r, --restart tag [tag...] restart named components\n");
+
+  printf ("\nInformational options:\n");
+  printf ("  -h, --help                 display this help list\n");
+  printf ("  -v, --version              display program version\n");
+
+
   printf ("\n");
   printf ("Report bugs to <%s>\n", PACKAGE_BUGREPORT);
 }
@@ -356,6 +368,18 @@ cfg_pidfile (struct cfg_file *file, char *kw, char *val, void *unused)
 }
 
 void
+cfg_ctlfile (struct cfg_file *file, char *kw, char *val, void *unused)
+{
+  ctlfile = strdup (val);
+}
+
+void
+cfg_statfile (struct cfg_file *file, char *kw, char *val, void *unused)
+{
+  ctlfile = strdup (val);
+}
+
+void
 cfg_umask (struct cfg_file *file, char *kw, char *val, void *unused)
 {
   char *p;
@@ -390,60 +414,76 @@ cfg_prog (struct cfg_file *file, char *kw, char *val, void *unused)
   register_jabber_process (prog, val);
 }
 
-struct exec_rec {
+struct transport_rec
+{
   char *tag;
   char *command;
   int facility;
   int retr[2];
+  int depc;
+  char **depv;
 };
 
 static void
-cfg_exec_command (struct cfg_file *file, char *kw, char *val, void *data)
+cfg_transport_command (struct cfg_file *file, char *kw, char *val, void *data)
 {
-  struct exec_rec *prec = data;
+  struct transport_rec *prec = data;
   prec->command = strdup (val);
 }
 
 void
-cfg_exec_facility (struct cfg_file *file, char *kw, char *val, void *data)
+cfg_transport_facility (struct cfg_file *file, char *kw, char *val, void *data)
 {
-  struct exec_rec *prec = data;
+  struct transport_rec *prec = data;
   if (str_to_facility (val, &prec->facility))
     logmsg (LOG_ERR, "%s:%u: Unknown facility `%s'",
             config_file, file->line, val);
 }
 
 void
-cfg_exec_stdout (struct cfg_file *file, char *kw, char *val, void *data)
+cfg_transport_stdout (struct cfg_file *file, char *kw, char *val, void *data)
 {
-  struct exec_rec *prec = data;
+  struct transport_rec *prec = data;
   if (str_to_priority (val, &prec->retr[RETR_OUT]))
     logmsg (LOG_ERR, "%s:%u: Unknown priority `%s'",
             config_file, file->line, val);
 }
 
 void
-cfg_exec_stderr (struct cfg_file *file, char *kw, char *val, void *data)
+cfg_transport_stderr (struct cfg_file *file, char *kw, char *val, void *data)
 {
-  struct exec_rec *prec = data;
+  struct transport_rec *prec = data;
   if (str_to_priority (val, &prec->retr[RETR_ERR]))
     logmsg (LOG_ERR, "%s:%u: Unknown priority `%s'",
             config_file, file->line, val);
 }
 
 void
-cfg_exec (struct cfg_file *file, char *kw, char *val, void *unused)
+cfg_transport_depend (struct cfg_file *file, char *kw, char *val, void *data)
+{
+  struct transport_rec *prec = data;
+  int rc;
+  if (rc = argcv_get (val, NULL, NULL, &prec->depc, &prec->depv))
+    {
+      logmsg (LOG_ERR, "%s:%u: cannot split dependency line: %s",
+              config_file, file->line, strerror (rc));
+    }
+}
+
+void
+cfg_transport (struct cfg_file *file, char *kw, char *val, void *unused)
 {
   int rc;
   int argc;
   char **argv;
   
-  struct exec_rec rec; 
+  struct transport_rec rec; 
   static struct kw_handler kwtab[] = {
-    { "command", cfg_exec_command },
-    { "stdout", cfg_exec_stdout },
-    { "stderr", cfg_exec_stderr },
-    { "facility", cfg_exec_facility },
+    { "command", cfg_transport_command },
+    { "stdout", cfg_transport_stdout },
+    { "stderr", cfg_transport_stderr },
+    { "facility", cfg_transport_facility },
+    { "depend", cfg_transport_depend },
     { NULL }
   };
   memset (&rec, 0, sizeof rec);
@@ -459,9 +499,10 @@ cfg_exec (struct cfg_file *file, char *kw, char *val, void *unused)
               config_file, file->line, strerror (rc));
       return;
     }
-  register_prog (rec.tag, argv, rec.retr);
+  register_transport (rec.tag, argv, rec.retr, rec.depv);
   free (rec.tag);
   free (rec.command);
+  argcv_free (rec.depc, rec.depv);
   argcv_free (argc, argv);
 }
 
@@ -482,9 +523,12 @@ struct kw_handler kw_handler[] = {
   { "user", cfg_user },
   { "group", cfg_group },
   { "pidfile", cfg_pidfile },
+  { "ctlfile", cfg_ctlfile },
+  { "statfile", cfg_statfile },
   { "umask", cfg_umask },
   { "prog", cfg_prog },
-  { "exec", cfg_exec },
+  { "transport", cfg_transport },
+  { "exec", cfg_transport },
   { "shutdown-timeout", cfg_shutdown_timeout },
   { NULL }
 };
@@ -516,24 +560,59 @@ parse_config ()
 void
 pidfile_write ()
 {
-  if (pidfile)
+  FILE *fp = fopen (pidfile, "w");
+  if (!fp)
+    {
+      logmsg (LOG_CRIT, "cannot open pidfile `%s' for writing: %s",
+              pidfile, strerror (errno));
+      return;
+    }
+  fprintf (fp, "%lu\n", (unsigned long) getpid ());
+  fclose (fp);
+}
+
+pid_t
+pidfile_read (int must_exist)
+{
+  int c;
+  pid_t n = 0;
+  FILE *fp = fopen (pidfile, "r");
+  if (!fp)
     {
-      FILE *fp = fopen (pidfile, "w");
-      if (!fp)
+      if (must_exist && errno != ENOENT)
+        logmsg (LOG_ERR, "cannot open pid file `%s': %s",
+                pidfile,