further arm do daemonize hack, easier to debug arm startup (debatable)

2 files changed, 17 insertions, 8 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index ac473e87e..66747a624 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -439,7 +439,11 @@ arm_service_report (void *cls,
                                                       "WEAKRANDOM")) &&
       (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (pos->h->cfg,
                                                            "TESTING",
-                                                           "WEAKRANDOM")))
+                                                           "WEAKRANDOM")) &&
+      (GNUNET_NO == GNUNET_CONFIGURATION_have_value (pos->h->cfg,
+                                                     "TESTING",
+                                                     "HOSTFILE")) /* Means we are ONLY running locally */
+                                                           )
     {
       /* we're clearly running a test, don't daemonize */
       pid = do_start_process (NULL,
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 1d96c2d4c..7ec717a5a 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -389,13 +389,18 @@ main (int argc, char *const *argv)
      GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
     GNUNET_GETOPT_OPTION_END
   };
-  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;
+
+  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 */