From 6202dff2295abe7813a12bb53b90916bf26bb132 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 11 Aug 2011 11:05:35 +0000 Subject: use bind instead of connect to test if service is running to avoid long timeouts during startup --- src/arm/arm_api.c | 3 +-- src/arm/gnunet-arm.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/arm') diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index c5caa5393..4114b8528 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -379,8 +379,6 @@ arm_service_report (void *cls, "Looks like `%s' is not running, will start it.\n", "gnunet-service-arm"); #endif - /* FIXME: should we check that HOSTNAME for 'arm' is localhost? */ - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (pos->h->cfg, "arm", "PREFIX", &loprefix)) @@ -621,6 +619,7 @@ GNUNET_ARM_start_service (struct GNUNET_ARM_Handle *h, struct RequestContext *sctx; struct GNUNET_CLIENT_Connection *client; size_t slen; + #if DEBUG_ARM GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Asked to start service `%s' within %llu ms\n"), service_name, diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index c2663aba9..ccad0f21f 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -46,7 +46,7 @@ * (by checking if running before starting, so really this time is always waited on * startup (annoying)). */ -#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 1000) +#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) /** * Timeout for starting services, very short because of the strange way start works -- cgit v1.2.3