X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fdaemon%2Fsysdbd.c;fp=src%2Fdaemon%2Fsysdbd.c;h=5a901a223bf432ad02b542bba11c1b2e32ea03a3;hp=d4851f8e42f123fa71dbbceae972fb0a24897390;hb=848efadda124a4778f08a84a082ff2436504d22c;hpb=a6bb88e99588be4c62aa7a81bfae643b3c1888fa diff --git a/src/daemon/sysdbd.c b/src/daemon/sysdbd.c index d4851f8..5a901a2 100644 --- a/src/daemon/sysdbd.c +++ b/src/daemon/sysdbd.c @@ -109,7 +109,7 @@ daemonize(void) if ((pid = fork()) < 0) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Failed to fork to background: %s\n", + sdb_log(SDB_LOG_ERR, "Failed to fork to background: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); return errno; } @@ -120,7 +120,7 @@ daemonize(void) if (chdir("/")) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Failed to change working directory to " + sdb_log(SDB_LOG_ERR, "Failed to change working directory to " "the root directory: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); return errno; @@ -132,7 +132,7 @@ daemonize(void) close(0); if (open("/dev/null", O_RDWR)) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Failed to connect stdin to '/dev/null': " + sdb_log(SDB_LOG_ERR, "Failed to connect stdin to '/dev/null': " "%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); return errno; } @@ -140,7 +140,7 @@ daemonize(void) close(1); if (dup(0) != 1) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Could not connect stdout to '/dev/null': " + sdb_log(SDB_LOG_ERR, "Could not connect stdout to '/dev/null': " "%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); return errno; } @@ -148,7 +148,7 @@ daemonize(void) close(2); if (dup(0) != 2) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Could not connect stderr to '/dev/null': " + sdb_log(SDB_LOG_ERR, "Could not connect stderr to '/dev/null': " "%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); return errno; } @@ -195,7 +195,7 @@ main(int argc, char **argv) config_filename = CONFIGFILE; if (daemon_parse_config(config_filename)) { - sdb_error_set(SDB_LOG_ERR, "Failed to parse configuration file.\n"); + sdb_log(SDB_LOG_ERR, "Failed to parse configuration file.\n"); exit(1); } @@ -205,13 +205,13 @@ main(int argc, char **argv) if (sigaction(SIGINT, &sa_intterm, /* old action */ NULL)) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Failed to install signal handler for " + sdb_log(SDB_LOG_ERR, "Failed to install signal handler for " "SIGINT: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); exit(1); } if (sigaction(SIGTERM, &sa_intterm, /* old action */ NULL)) { char errbuf[1024]; - sdb_error_set(SDB_LOG_ERR, "Failed to install signal handler for " + sdb_log(SDB_LOG_ERR, "Failed to install signal handler for " "SIGTERM: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf))); exit(1); } @@ -220,14 +220,14 @@ main(int argc, char **argv) if (daemonize()) exit(1); - sdb_error_set(SDB_LOG_INFO, "SysDB daemon "SDB_VERSION_STRING + sdb_log(SDB_LOG_INFO, "SysDB daemon "SDB_VERSION_STRING SDB_VERSION_EXTRA " (pid %i) initialized successfully\n", (int)getpid()); sdb_plugin_init_all(); sdb_plugin_collector_loop(&plugin_main_loop); - sdb_error_set(SDB_LOG_INFO, "Shutting down SysDB daemon "SDB_VERSION_STRING + sdb_log(SDB_LOG_INFO, "Shutting down SysDB daemon "SDB_VERSION_STRING SDB_VERSION_EXTRA" (pid %i)\n", (int)getpid()); fprintf(stderr, "Store dump:\n");