X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=c11fb58a9cc234ee6316b3850b758b96286a65a7;hp=c9400e9cdcdde5dfa9ec9cdcf0f0b27bbd09a4f8;hb=f85e05c0b3951e7d3119983c118c82d71f2662a3;hpb=f645b538c8f3dd88ce9a9ad5dbeb6cf341ad74ab

diff --git a/server.c b/server.c
index c9400e9c..c11fb58a 100644
--- a/server.c
+++ b/server.c
@@ -85,6 +85,7 @@
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
+#include "color.h"
 
 /** Define the array of error lists needed by para_server. */
 INIT_SERVER_ERRLISTS;
@@ -112,8 +113,6 @@ 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;
@@ -131,36 +130,30 @@ struct server_command_task {
 	struct task task;
 };
 
-/**
- * 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,...)
+static int want_colors(void)
+{
+	if (conf.color_arg == color_arg_no)
+		return 0;
+	if (conf.color_arg == color_arg_yes)
+		return 1;
+	if (conf.logfile_given)
+		return 0;
+	return isatty(STDERR_FILENO);
+}
+
+static void init_colors_or_die(void)
 {
-	va_list argp;
-	FILE *outfd;
-	struct tm *tm;
-	time_t t1;
-	char str[MAXLINE] = "";
-	pid_t mypid;
-
-	if (ll < conf.loglevel_arg)
+	int ret, i;
+
+	if (!want_colors())
 		return;
-	outfd = logfile? logfile : stderr;
-	time(&t1);
-	tm = localtime(&t1);
-	strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
-	fprintf(outfd, "%s ", str);
-	if (conf.loglevel_arg <= LL_INFO)
-		fprintf(outfd, "%i: ", ll);
-	mypid = getpid();
-	if (conf.loglevel_arg <= LL_INFO)
-		fprintf(outfd, "(%d) ", (int)mypid);
-	va_start(argp, fmt);
-	vfprintf(outfd, fmt, argp);
-	va_end(argp);
+	daemon_set_flag(DF_COLOR_LOG);
+	daemon_set_default_log_colors();
+	for (i = 0; i < conf.log_color_given; i++) {
+		ret = daemon_set_log_color(conf.log_color_arg[i]);
+		if (ret < 0)
+			exit(EXIT_FAILURE);
+	}
 }
 
 /*
@@ -209,12 +202,10 @@ err_out:
 void parse_config_or_die(int override)
 {
 	char *home = para_homedir();
-	struct stat statbuf;
-	int ret;
+	int ret, ll = conf.loglevel_arg;
 	char *cf;
 
-	close_log(logfile);
-	logfile = NULL;
+	daemon_close_log();
 	if (conf.config_file_given)
 		cf = para_strdup(conf.config_file_arg);
 	else
@@ -224,13 +215,13 @@ 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,
@@ -242,8 +233,15 @@ void parse_config_or_die(int override)
 		server_cmdline_parser_config_file(cf, &conf, &params);
 		conf.daemon_given = tmp;
 	}
-	if (conf.logfile_given)
-		logfile = open_log(conf.logfile_arg);
+	if (conf.logfile_given) {
+		daemon_set_logfile(conf.logfile_arg);
+		daemon_open_log_or_die();
+	}
+	daemon_set_loglevel(ll);
+	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);
@@ -501,7 +499,7 @@ 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();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");