[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10594 - in gnunet: contrib doc/man src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10594 - in gnunet: contrib doc/man src/util |
Date: |
Mon, 15 Mar 2010 10:39:23 +0100 |
Author: grothoff
Date: 2010-03-15 10:39:23 +0100 (Mon, 15 Mar 2010)
New Revision: 10594
Modified:
gnunet/contrib/defaults.conf
gnunet/doc/man/gnunet-peerinfo.1
gnunet/src/util/configuration.c
gnunet/src/util/service.c
Log:
better defaults, nicer error msgs:
Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf 2010-03-15 07:58:30 UTC (rev 10593)
+++ gnunet/contrib/defaults.conf 2010-03-15 09:39:23 UTC (rev 10594)
@@ -1,6 +1,9 @@
[PATHS]
SERVICEHOME = /var/lib/gnunet/
-DEFAULTCONFIG = /etc/gnunet.conf
+# DEFAULTCONFIG = /etc/gnunet.conf
+# If 'DEFAULTCONFIG' is not defined, the current
+# configuration file is assumed to be the default,
+# which is what we want by default...
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/doc/man/gnunet-peerinfo.1
===================================================================
--- gnunet/doc/man/gnunet-peerinfo.1 2010-03-15 07:58:30 UTC (rev 10593)
+++ gnunet/doc/man/gnunet-peerinfo.1 2010-03-15 09:39:23 UTC (rev 10594)
@@ -15,7 +15,7 @@
.SH OPTIONS
.B
.IP "\-c FILENAME, \-\-config=FILENAME"
-Load config file (default: /etc/gnunet.conf)
+Load config file (default: ~/.gnunet/gnunet.conf)
.B
.IP "\-h, \-\-help"
Print help page
Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c 2010-03-15 07:58:30 UTC (rev 10593)
+++ gnunet/src/util/configuration.c 2010-03-15 09:39:23 UTC (rev 10594)
@@ -1140,10 +1140,18 @@
(!((filename == NULL) ||
(GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename)))))
{
- GNUNET_free (baseconfig);
+ GNUNET_free (baseconfig);
return GNUNET_SYSERR;
}
GNUNET_free (baseconfig);
+ if ( ((GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg,
+ "PATHS",
+ "DEFAULTCONFIG"))) &&
+ (filename != NULL) )
+ GNUNET_CONFIGURATION_set_value_string (cfg,
+ "PATHS",
+ "DEFAULTCONFIG",
+ filename);
if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (cfg,
"TESTING",
"WEAKRANDOM")) &&
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2010-03-15 07:58:30 UTC (rev 10593)
+++ gnunet/src/util/service.c 2010-03-15 09:39:23 UTC (rev 10594)
@@ -999,8 +999,13 @@
GNUNET_CONFIGURATION_get_value_time (sctx->cfg,
sctx->serviceName,
"TIMEOUT", &idleout))
- return GNUNET_SYSERR;
-
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is
invalid\n"),
+ "TIMEOUT",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
sctx->timeout = idleout;
}
else
@@ -1012,7 +1017,13 @@
GNUNET_CONFIGURATION_get_value_number (sctx->cfg,
sctx->serviceName,
"MAXBUF", &maxbuf))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is
invalid\n"),
+ "MAXBUF",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
maxbuf = GNUNET_SERVER_MAX_MESSAGE_SIZE;
@@ -1023,7 +1034,13 @@
(sctx->allow_shutdown =
GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg, sctx->serviceName,
"ALLOW_SHUTDOWN")))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is
invalid\n"),
+ "ALLOW_SHUTDOWN",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
sctx->allow_shutdown = GNUNET_NO;
@@ -1036,7 +1053,13 @@
(tolerant = GNUNET_CONFIGURATION_get_value_yesno (sctx->cfg,
sctx->serviceName,
"TOLERANT")))
- return GNUNET_SYSERR;
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Specified value for `%s' of service `%s' is
invalid\n"),
+ "TOLERANT",
+ sctx->serviceName);
+ return GNUNET_SYSERR;
+ }
}
else
tolerant = GNUNET_NO;
@@ -1417,17 +1440,17 @@
/* setup subsystems */
if (GNUNET_SYSERR == GNUNET_GETOPT_run (serviceName, service_options, argc,
argv))
- HANDLE_ERROR;
+ goto shutdown;
if (GNUNET_OK != GNUNET_log_setup (serviceName, loglev, logfile))
HANDLE_ERROR;
if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_fn))
- HANDLE_ERROR;
+ goto shutdown;
if (GNUNET_OK != setup_service (&sctx))
- HANDLE_ERROR;
+ goto shutdown;
if ( (do_daemonize == 1) && (GNUNET_OK != detach_terminal (&sctx)))
HANDLE_ERROR;
if (GNUNET_OK != set_user_id (&sctx))
- HANDLE_ERROR;
+ goto shutdown;
#if DEBUG_SERVICE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Service `%s' runs with configuration from `%s'\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10594 - in gnunet: contrib doc/man src/util,
gnunet <=