aboutsummaryrefslogtreecommitdiff
path: root/src/arm/gnunet-arm.c
diff options
context:
space:
mode:
authorgrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2010-11-02 10:27:12 +0000
committergrothoff <grothoff@140774ce-b5e7-0310-ab8b-a85725594a96>2010-11-02 10:27:12 +0000
commit776c56be83ceb4d77d783b33966a8ddd4d8f653c (patch)
treef515f183920fda5039b51faca1e703f9495fd8be /src/arm/gnunet-arm.c
parent7af0fadeaabab4adc801b3a26b65429d42e8e9c8 (diff)
need longer timeout, better error message
git-svn-id: https://gnunet.org/svn/gnunet@13488 140774ce-b5e7-0310-ab8b-a85725594a96
Diffstat (limited to 'src/arm/gnunet-arm.c')
-rw-r--r--src/arm/gnunet-arm.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index a9bf4a38ee..c19020ccb6 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -37,6 +37,11 @@
#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
/**
+ * Timeout for stopping ARM. Extra-long since ARM needs to stop everyone else.
+ */
+#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
+/**
* Timeout for starting services, very short because of the strange way start works
* (by checking if running before starting, so really this time is always waited on
* startup (annoying)).
@@ -304,7 +309,7 @@ cps_loop (void *cls,
case 1:
if ((end) || (restart))
{
- GNUNET_ARM_stop_service (h, "arm", STOP_TIMEOUT, &confirm_cb, "arm");
+ GNUNET_ARM_stop_service (h, "arm", STOP_TIMEOUT_ARM, &confirm_cb, "arm");
return;
}
break;