X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=9c06991378512172e95b70165118ae1ea873bdb1;hp=1fadf7279306b6fab8d195199b15d83ac5646607;hb=36bc7580a5ddee8f6e46bccfea7519291f372f0f;hpb=11018ebcc1cb1c002fc3488d247a43774ca408d7 diff --git a/server.c b/server.c index 1fadf727..9c069913 100644 --- a/server.c +++ b/server.c @@ -113,11 +113,8 @@ uint32_t afs_socket_cookie; /** The mutex protecting the shared memory area containing the mmd struct. */ int mmd_mutex; -/* global variables for server-internal use */ -static FILE *logfile; /** The file containing user information (public key, permissions). */ static char *user_list_file = NULL; -static int mmd_shm_id; /** The task responsible for server command handling. */ @@ -138,112 +135,24 @@ static int want_colors(void) return 0; if (conf.color_arg == color_arg_yes) return 1; - if (logfile) + if (conf.logfile_given) return 0; return isatty(STDERR_FILENO); } -static int get_loglevel_by_name(const char *txt, size_t n) -{ - if (!strncasecmp(txt, "debug", n)) - return LL_DEBUG; - if (!strncasecmp(txt, "info", n)) - return LL_INFO; - if (!strncasecmp(txt, "notice", n)) - return LL_NOTICE; - if (!strncasecmp(txt, "warning", n)) - return LL_WARNING; - if (!strncasecmp(txt, "error", n)) - return LL_ERROR; - if (!strncasecmp(txt, "crit", n)) - return LL_CRIT; - if (!strncasecmp(txt, "emerg", n)) - return LL_EMERG; - return -1; -} - -static char log_colors[NUM_LOGLEVELS][COLOR_MAXLEN]; - static void init_colors_or_die(void) { int ret, i; - static const char *default_log_colors[NUM_LOGLEVELS] = { - [LL_DEBUG] = "normal", - [LL_INFO] = "white bold", - [LL_NOTICE] = "cyan bold", - [LL_WARNING] = "green bold", - [LL_ERROR] = "yellow bold", - [LL_CRIT] = "magenta bold", - [LL_EMERG] = "red bold", - }; - - for (i = 0; i < NUM_LOGLEVELS; i++) { - ret = color_parse(default_log_colors[i], log_colors[i]); - assert(ret >= 0); - } + if (!want_colors()) + return; + daemon_set_flag(DF_COLOR_LOG); + daemon_set_default_log_colors(); for (i = 0; i < conf.log_color_given; i++) { - char *arg = conf.log_color_arg[i], *p = strchr(arg, ':'); - int ll; - if (!p) - goto err; - ret = get_loglevel_by_name(arg, p - arg); + ret = daemon_set_log_color(conf.log_color_arg[i]); if (ret < 0) - goto err; - ll = ret; - p++; - ret = color_parse(p, log_colors[ll]); - if (ret < 0) - goto err; + exit(EXIT_FAILURE); } - return; -err: - PARA_EMERG_LOG("color syntax error, arg %d (%s)\n", i, - conf.log_color_arg[i]); - exit(EXIT_FAILURE); -} - -/** - * Para_server's log function. - * - * \param ll The log level. - * \param fmt The format string describing the log message. - */ -__printf_2_3 void para_log(int ll, const char* fmt,...) -{ - va_list argp; - FILE *fp; - struct tm *tm; - time_t t1; - char *color, str[MAXLINE] = ""; - - ll = PARA_MIN(ll, NUM_LOGLEVELS - 1); - ll = PARA_MAX(ll, LL_DEBUG); - if (ll < conf.loglevel_arg) - return; - - fp = logfile? logfile : stderr; - color = want_colors()? log_colors[ll] : NULL; - - if (color) - fprintf(fp, "%s", color); - /* date and time */ - time(&t1); - tm = localtime(&t1); - strftime(str, MAXLINE, "%b %d %H:%M:%S", tm); - fprintf(fp, "%s ", str); - /* loglevel */ - if (conf.loglevel_arg <= LL_INFO) - fprintf(fp, "%i: ", ll); - if (conf.loglevel_arg <= LL_INFO) { /* log pid */ - pid_t mypid = getpid(); - fprintf(fp, "(%d) ", (int)mypid); - } - va_start(argp, fmt); - vfprintf(fp, fmt, argp); - va_end(argp); - if (color) - fprintf(fp, "%s", COLOR_RESET); } /* @@ -252,16 +161,16 @@ __printf_2_3 void para_log(int ll, const char* fmt,...) static void init_ipc_or_die(void) { void *shm; - int ret = shm_new(sizeof(struct misc_meta_data)); + int shmid, ret = shm_new(sizeof(struct misc_meta_data)); if (ret < 0) goto err_out; - - ret = shm_attach(ret, ATTACH_RW, &shm); + shmid = ret; + ret = shm_attach(shmid, ATTACH_RW, &shm); + shm_destroy(shmid); if (ret < 0) goto err_out; mmd = shm; - mmd_shm_id = ret; ret = mutex_new(); if (ret < 0) @@ -292,12 +201,10 @@ err_out: void parse_config_or_die(int override) { char *home = para_homedir(); - struct stat statbuf; int ret; char *cf; - close_log(logfile); - logfile = NULL; + daemon_close_log(); if (conf.config_file_given) cf = para_strdup(conf.config_file_arg); else @@ -307,28 +214,33 @@ void parse_config_or_die(int override) user_list_file = make_message("%s/.paraslash/server.users", home); else user_list_file = para_strdup(conf.user_list_arg); - ret = stat(cf, &statbuf); - if (ret && conf.config_file_given) { + ret = file_exists(cf); + if (conf.config_file_given && !ret) { ret = -1; - PARA_EMERG_LOG("can not stat config file %s\n", cf); + PARA_EMERG_LOG("can not read config file %s\n", cf); goto out; } - if (!ret) { + if (ret) { int tmp = conf.daemon_given; struct server_cmdline_parser_params params = { .override = override, .initialize = 0, .check_required = 1, .check_ambiguity = 0, - .print_errors = 1 + .print_errors = !conf.daemon_given }; server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp; } - if (conf.logfile_given) - logfile = open_log(conf.logfile_arg); - if (want_colors()) - init_colors_or_die(); + if (conf.logfile_given) { + daemon_set_logfile(conf.logfile_arg); + daemon_open_log_or_die(); + } + daemon_set_loglevel(conf.loglevel_arg); + init_colors_or_die(); + daemon_set_flag(DF_LOG_PID); + daemon_set_flag(DF_LOG_LL); + daemon_set_flag(DF_LOG_TIME); ret = 1; out: free(cf); @@ -390,8 +302,6 @@ genocide: kill(0, SIGTERM); mutex_destroy(mmd_mutex); shm_detach(mmd); - shm_destroy(mmd_shm_id); - exit(EXIT_FAILURE); } } @@ -418,8 +328,6 @@ static void init_signal_task(void) goto err; if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) goto err; - if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) - goto err; add_close_on_fork_list(st->fd); register_task(&st->task); return; @@ -578,7 +486,7 @@ static void server_init(int argc, char **argv) drop_privileges_or_die(conf.user_arg, conf.group_arg); /* parse config file, open log and set defaults */ parse_config_or_die(0); - log_welcome("para_server", conf.loglevel_arg); + log_welcome("para_server"); init_ipc_or_die(); /* init mmd struct and mmd->lock */ /* make sure, the global now pointer is uptodate */ gettimeofday(now, NULL); @@ -586,9 +494,21 @@ static void server_init(int argc, char **argv) init_user_list(user_list_file); /* become daemon */ if (conf.daemon_given) - daemon_init(); + daemonize(); PARA_NOTICE_LOG("initializing audio format handlers\n"); afh_init(); + + /* + * Although afs uses its own signal handling we must ignore SIGUSR1 + * _before_ the afs child process gets born by init_afs() below. It's + * racy to do this in the child because the parent might send SIGUSR1 + * before the child gets a chance to ignore this signal -- only the + * good die young. + */ + if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) { + PARA_EMERG_LOG("failed to ignore SIGUSR1\n"); + exit(EXIT_FAILURE); + } PARA_NOTICE_LOG("initializing the audio file selector\n"); afs_socket = init_afs(); init_signal_task();