[GNUnet-SVN] r12416 - gnunet/src/arm

[gnunet]

Author: nevans
Date: 2010-07-30 17:04:11 +0200 (Fri, 30 Jul 2010)
New Revision: 12416

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-arm.c
Log:
further arm do daemonize hack, easier to debug arm startup (debatable)

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2010-07-30 14:53:55 UTC (rev 12415)
+++ gnunet/src/arm/arm_api.c    2010-07-30 15:04:11 UTC (rev 12416)
@@ -439,7 +439,11 @@
                                                       "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,

Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2010-07-30 14:53:55 UTC (rev 12415)
+++ gnunet/src/arm/gnunet-arm.c 2010-07-30 15:04:11 UTC (rev 12416)
@@ -389,13 +389,18 @@
      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 */