oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

listen: handle fatal errors with GError

Browse Source 
Don't call g_error(), which will abort the process and dump core.
This commit is contained in:
Max Kellermann 2009-09-24 21:40:04 +02:00
parent 1e56107967
commit 308b3f2337
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/listen.c
View File

@ -347,7 +347,8 @@ listen_add_config_param(unsigned int port,
} }
} }
void listen_global_init(void) bool
listen_global_init(GError **error_r)
{ {
int port = config_get_positive(CONF_PORT, DEFAULT_PORT); int port = config_get_positive(CONF_PORT, DEFAULT_PORT);
const struct config_param *param = const struct config_param *param =
@ -361,10 +362,12 @@ void listen_global_init(void)
do { do {
success = listen_add_config_param(port, param, &error); success = listen_add_config_param(port, param, &error);
if (!success) if (!success) {
g_error("Failed to listen on %s (line %i): %s", g_propagate_prefixed_error(error_r, error,
param->value, param->line, "Failed to listen on %s (line %i): ",
error->message); param->value, param->line);
return false;
}
param = config_get_next_param(CONF_BIND_TO_ADDRESS, param = config_get_next_param(CONF_BIND_TO_ADDRESS,
param); param);
@ -374,12 +377,16 @@ void listen_global_init(void)
configured port on all interfaces */ configured port on all interfaces */
success = listen_add_port(port, &error); success = listen_add_port(port, &error);
if (!success) if (!success) {
g_error("Failed to listen on *:%d: %s", g_propagate_prefixed_error(error_r, error,
port, error->message); "Failed to listen on *:%d: ",
port);
return false;
}
} }
listen_port = port; listen_port = port;
return true;
} }
void listen_global_finish(void) void listen_global_finish(void)

7
src/listen.h
View File

@ -20,9 +20,14 @@
#ifndef MPD_LISTEN_H #ifndef MPD_LISTEN_H
#define MPD_LISTEN_H #define MPD_LISTEN_H
#include <glib.h>
#include <stdbool.h>
extern int listen_port; extern int listen_port;
void listen_global_init(void); bool
listen_global_init(GError **error_r);
void listen_global_finish(void); void listen_global_finish(void);

9
src/main.c
View File

@ -273,6 +273,8 @@ int main(int argc, char *argv[])
struct options options; struct options options;
clock_t start; clock_t start;
bool create_db; bool create_db;
GError *error = NULL;
bool success;
daemonize_close_stdin(); daemonize_close_stdin();
@ -301,7 +303,12 @@ int main(int argc, char *argv[])
tag_lib_init(); tag_lib_init();
log_init(options.verbose, options.log_stderr); log_init(options.verbose, options.log_stderr);
listen_global_init(); success = listen_global_init(&error);
if (!success) {
g_warning("%s", error->message);
g_error_free(error);
return EXIT_FAILURE;
}
daemonize_set_user(); daemonize_set_user();