Smallers steps to keep plugin running

[oweals/gnunet.git] / src / arm / gnunet-arm.c

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index c631ec48086d3e35e98163d9368f9beee2153149..7ec717a5adf4fa8251e757e632231fb4d89b0f1e 100644 (file)
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -34,7 +34,7 @@
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
  */
-#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 360)
+#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * Timeout for starting services, very short because of the strange way start works
@@ -235,10 +235,13 @@ run (void *cls,
   cfg = c;
   config_file = cfgfile;
   if (GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "SERVICEHOME", &dir) != GNUNET_OK)
-  {
-    dir = NULL;
-  }
-
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 _("Fatal configuration error: `%s' option in section `%s' missing.\n"),
+                 "SERVICEHOME",
+                 "PATHS");
+      return;
+    }
   h = GNUNET_ARM_connect (cfg, sched, NULL);
   if (h == NULL)
     {
@@ -356,31 +359,6 @@ cps_loop (void *cls,
 }
 
 
-/**
- * gnunet-arm command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  {'e', "end", NULL, gettext_noop ("stop all GNUnet services"),
-   GNUNET_NO, &GNUNET_GETOPT_set_one, &end},
-  {'i', "init", "SERVICE", gettext_noop ("start a particular service"),
-   GNUNET_YES, &GNUNET_GETOPT_set_string, &init},
-  {'k', "kill", "SERVICE", gettext_noop ("stop a particular service"),
-   GNUNET_YES, &GNUNET_GETOPT_set_string, &term},
-  {'s', "start", NULL, gettext_noop ("start all GNUnet default services"),
-   GNUNET_NO, &GNUNET_GETOPT_set_one, &start},
-  {'r', "restart", NULL, gettext_noop ("stop and start all GNUnet default services"),
-    GNUNET_NO, &GNUNET_GETOPT_set_one, &restart},
-  {'t', "test", "SERVICE",
-   gettext_noop ("test if a particular service is running"),
-   GNUNET_YES, &GNUNET_GETOPT_set_string, &test},
-  {'d', "delete", NULL, gettext_noop ("delete config file and directory on exit"),
-   GNUNET_NO, &GNUNET_GETOPT_set_one, &delete},
-  {'q', "quiet", NULL, gettext_noop ("don't print status messages"),
-   GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to obtain arm from gnunetd.
  *
@@ -391,13 +369,38 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc,
-                              argv,
-                              "gnunet-arm",
-                              gettext_noop
-                              ("Control services and the Automated Restart Manager (ARM)"),
-                              options, &run, NULL)) ? ret : 1;
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'e', "end", NULL, gettext_noop ("stop all GNUnet services"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &end},
+    {'i', "init", "SERVICE", gettext_noop ("start a particular service"),
+     GNUNET_YES, &GNUNET_GETOPT_set_string, &init},
+    {'k', "kill", "SERVICE", gettext_noop ("stop a particular service"),
+     GNUNET_YES, &GNUNET_GETOPT_set_string, &term},
+    {'s', "start", NULL, gettext_noop ("start all GNUnet default services"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &start},
+    {'r', "restart", NULL, gettext_noop ("stop and start all GNUnet default services"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &restart},
+    {'t', "test", "SERVICE",
+     gettext_noop ("test if a particular service is running"),
+     GNUNET_YES, &GNUNET_GETOPT_set_string, &test},
+    {'d', "delete", NULL, gettext_noop ("delete config file and directory on exit"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &delete},
+    {'q', "quiet", NULL, gettext_noop ("don't print status messages"),
+     GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  if (GNUNET_OK == GNUNET_PROGRAM_run (argc,
+                      argv,
+                      "gnunet-arm",
+                      gettext_noop
+                      ("Control services and the Automated Restart Manager (ARM)"),
+                      options, &run, NULL))
+    {
+      return ret;
+    }
+
+    return 1;
 }
 
 /* end of gnunet-arm.c */