projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4562b4f
)
-allow config-less services to run
author
Christian Grothoff
<christian@grothoff.org>
Mon, 5 Nov 2012 13:41:43 +0000
(13:41 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Mon, 5 Nov 2012 13:41:43 +0000
(13:41 +0000)
src/util/service.c
patch
|
blob
|
history
diff --git
a/src/util/service.c
b/src/util/service.c
index 67d8583cc943f242b40f313f293c7bbc7d91b5a9..8b779c61d8709eff4db3b52a8f627c9e0fb3b8ac 100644
(file)
--- a/
src/util/service.c
+++ b/
src/util/service.c
@@
-1778,8
+1778,17
@@
GNUNET_SERVICE_run (int argc, char *const *argv, const char *service_name,
}
if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
HANDLE_ERROR;
}
if (GNUNET_OK != GNUNET_log_setup (service_name, loglev, logfile))
HANDLE_ERROR;
- if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfg_fn))
- goto shutdown;
+ if (GNUNET_YES ==
+ GNUNET_DISK_file_test (cfg_fn))
+ (void) GNUNET_CONFIGURATION_load (cfg, cfg_fn);
+ else
+ {
+ (void) GNUNET_CONFIGURATION_load (cfg, NULL);
+ if (0 != strcmp (cfg_fn, GNUNET_DEFAULT_USER_CONFIG_FILE))
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not access configuration file `%s'\n"),
+ cfg_fn);
+ }
if (GNUNET_OK != setup_service (&sctx))
goto shutdown;
if ((1 == do_daemonize) && (GNUNET_OK != detach_terminal (&sctx)))
if (GNUNET_OK != setup_service (&sctx))
goto shutdown;
if ((1 == do_daemonize) && (GNUNET_OK != detach_terminal (&sctx)))