diff options
-rw-r--r-- | desktop/netsurf.c | 9 | ||||
-rw-r--r-- | utils/log.c | 20 |
2 files changed, 20 insertions, 9 deletions
diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 5702ebe93..bf8ff86aa 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -26,7 +26,6 @@ #include <libwapcaplet/libwapcaplet.h> #include "utils/config.h" -#include "utils/utsname.h" #include "utils/nsoption.h" #include "utils/corestrings.h" #include "utils/log.h" @@ -45,7 +44,6 @@ #include "render/html.h" #include "render/textplain.h" -#include "desktop/version.h" #include "desktop/browser.h" #include "desktop/system_colour.h" #include "desktop/searchweb.h" @@ -127,7 +125,6 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query, nserror netsurf_init(const char *messages, const char *store_path) { nserror ret; - struct utsname utsname; struct hlcache_parameters hlcache_parameters = { .bg_clean_time = HL_CACHE_CLEAN_TIME, .llcache = { @@ -154,12 +151,6 @@ nserror netsurf_init(const char *messages, const char *store_path) signal(SIGPIPE, SIG_IGN); #endif - LOG("NetSurf version '%s'", netsurf_version); - if (uname(&utsname) < 0) - LOG("Failed to extract machine information"); - else - LOG("NetSurf on <%s>, node <%s>, release <%s>, version <%s>, ""machine <%s>", utsname.sysname, utsname.nodename, utsname.release, utsname.version, utsname.machine); - messages_load(messages); /* corestrings init */ diff --git a/utils/log.c b/utils/log.c index d67ed7677..cc3f7a8df 100644 --- a/utils/log.c +++ b/utils/log.c @@ -24,6 +24,10 @@ #include <stdio.h> #include <sys/time.h> +#include "utils/config.h" +#include "utils/utsname.h" +#include "desktop/version.h" + #include "utils/log.h" /** flag to enable verbose logging */ @@ -34,6 +38,7 @@ static FILE *logfile; nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) { + struct utsname utsname; nserror ret = NSERROR_OK; if (((*pargc) > 1) && @@ -88,6 +93,21 @@ nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv) verbose_log = false; } + /* sucessfull logging initialisation so log system info */ + if (ret == NSERROR_OK) { + LOG("NetSurf version '%s'", netsurf_version); + if (uname(&utsname) < 0) { + LOG("Failed to extract machine information"); + } else { + LOG("NetSurf on <%s>, node <%s>, release <%s>, version <%s>, machine <%s>", + utsname.sysname, + utsname.nodename, + utsname.release, + utsname.version, + utsname.machine); + } + } + return ret; } |