diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-07-30 15:04:11 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-07-30 15:04:11 +0000 |
commit | af0af530e6800e0c8f49d95931676506ab587830 (patch) | |
tree | fc93ed8669b4d9c18ae3a16374e81a79e6bef102 /src | |
parent | 8f1d5a8a9a094b98d1f8a45ae8b9c83bafcf3248 (diff) | |
download | gnunet-af0af530e6800e0c8f49d95931676506ab587830.tar.gz gnunet-af0af530e6800e0c8f49d95931676506ab587830.zip |
further arm do daemonize hack, easier to debug arm startup (debatable)
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/arm_api.c | 6 | ||||
-rw-r--r-- | src/arm/gnunet-arm.c | 19 |
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, | |||
439 | "WEAKRANDOM")) && | 439 | "WEAKRANDOM")) && |
440 | (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (pos->h->cfg, | 440 | (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (pos->h->cfg, |
441 | "TESTING", | 441 | "TESTING", |
442 | "WEAKRANDOM"))) | 442 | "WEAKRANDOM")) && |
443 | (GNUNET_NO == GNUNET_CONFIGURATION_have_value (pos->h->cfg, | ||
444 | "TESTING", | ||
445 | "HOSTFILE")) /* Means we are ONLY running locally */ | ||
446 | ) | ||
443 | { | 447 | { |
444 | /* we're clearly running a test, don't daemonize */ | 448 | /* we're clearly running a test, don't daemonize */ |
445 | pid = do_start_process (NULL, | 449 | 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) | |||
389 | GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet}, | 389 | GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet}, |
390 | GNUNET_GETOPT_OPTION_END | 390 | GNUNET_GETOPT_OPTION_END |
391 | }; | 391 | }; |
392 | return (GNUNET_OK == | 392 | |
393 | GNUNET_PROGRAM_run (argc, | 393 | if (GNUNET_OK == GNUNET_PROGRAM_run (argc, |
394 | argv, | 394 | argv, |
395 | "gnunet-arm", | 395 | "gnunet-arm", |
396 | gettext_noop | 396 | gettext_noop |
397 | ("Control services and the Automated Restart Manager (ARM)"), | 397 | ("Control services and the Automated Restart Manager (ARM)"), |
398 | options, &run, NULL)) ? ret : 1; | 398 | options, &run, NULL)) |
399 | { | ||
400 | return ret; | ||
401 | } | ||
402 | |||
403 | return 1; | ||
399 | } | 404 | } |
400 | 405 | ||
401 | /* end of gnunet-arm.c */ | 406 | /* end of gnunet-arm.c */ |