index 144128ccaadea8aeabf881ae9802e90dc69ec737..96fe6a645459d79aff04a4d13f7f6153b094d685 100644 (file)
--- a/src/tools/sysdbd/main.c
+++ b/src/tools/sysdbd/main.c
main_loop(void)
{
sdb_fe_socket_t *sock = sdb_fe_sock_create();
-
pthread_t backend_thread;
- while (42) {
+ int status = 0;
+
+ while (status == 0) {
size_t i;
plugin_main_loop.do_loop = 1;
break;
}
- for (i = 0; i < listen_addresses_num; ++i)
- if (sdb_fe_sock_add_listener(sock, listen_addresses[i]))
+ for (i = 0; i < listen_addresses_num; ++i) {
+ if (sdb_fe_sock_add_listener(sock, listen_addresses[i])) {
+ status = 1;
break;
+ }
+ }
/* break on error */
- if (i >= listen_addresses_num) {
- sdb_log(SDB_LOG_INFO, "SysDB daemon "SDB_VERSION_STRING
- SDB_VERSION_EXTRA " (pid %i) initialized successfully",
- (int)getpid());
+ if (status)
+ break;
- sdb_connection_enable_logging();
+ sdb_log(SDB_LOG_INFO, "SysDB daemon "SDB_VERSION_STRING
+ SDB_VERSION_EXTRA " (libsysdb %s%s, pid %i) initialized "
+ "successfully", sdb_version_string(), sdb_version_extra(),
+ (int)getpid());
- sdb_fe_sock_listen_and_serve(sock, &frontend_main_loop);
- }
+ sdb_connection_enable_logging();
+ sdb_fe_sock_listen_and_serve(sock, &frontend_main_loop);
sdb_log(SDB_LOG_INFO, "Waiting for backend thread to terminate");
plugin_main_loop.do_loop = 0;
sdb_fe_sock_clear_listeners(sock);
if (do_reconfigure()) {
sdb_log(SDB_LOG_ERR, "Reconfiguration failed");
+ status = 1;
break;
}
}
+ /* clean up in case we exited the loop on error */
+ plugin_main_loop.do_loop = 0;
+ frontend_main_loop.do_loop = 0;
+ pthread_kill(backend_thread, SIGINT);
+ pthread_join(backend_thread, NULL);
+
sdb_fe_sock_destroy(sock);
- return 0;
+ return status;
} /* main_loop */
int