odissey: remove config log_verbosity; add log_debug

odissey.conf

@@ -2,14 +2,14 @@
 #
 
 odissey {
-	log_verbosity    5
+	log_debug        yes
 #	log_file        "./odissey.log"
 #	pid_file        "./odissey.pid"
 #	syslog           no
 #	syslog_facility "daemon"
 #	syslog_ident    "odissey"
 #	daemonize        no
-	stats_period     5
+	stats_period     1
 	pooling "session"
 
 	listen {

src/od_config.c

@@ -39,7 +39,7 @@ static od_keyword_t od_config_keywords[] =
 	od_keyword("on",              OD_LON),
 	od_keyword("off",             OD_LOFF),
 	od_keyword("daemonize",       OD_LDAEMONIZE),
-	od_keyword("log_verbosity",   OD_LLOG_VERBOSITY),
+	od_keyword("log_debug"    ,   OD_LLOG_DEBUG),
 	od_keyword("log_file",        OD_LLOG_FILE),
 	od_keyword("pid_file",        OD_LPID_FILE),
 	od_keyword("syslog",          OD_LSYSLOG),
@@ -630,11 +630,12 @@ od_config_parse(od_config_t *config)
 				return -1;
 			config->scheme->daemonize = rc;
 			continue;
-		/* log_verbosity */
-		case OD_LLOG_VERBOSITY:
-			if (od_config_next(config, OD_LNUMBER, &tk) == -1)
+		/* log_debug */
+		case OD_LLOG_DEBUG:
+			rc = od_config_next_yes_no(config, &tk);
+			if (rc == -1)
 				return -1;
-			config->scheme->log_verbosity = tk->v.num;
+			config->scheme->log_debug = rc;
 			continue;
 		/* log_file */
 		case OD_LLOG_FILE:

src/od_config.h

@@ -15,7 +15,7 @@ enum
 	OD_LON,
 	OD_LOFF,
 	OD_LDAEMONIZE,
-	OD_LLOG_VERBOSITY,
+	OD_LLOG_DEBUG,
 	OD_LLOG_FILE,
 	OD_LPID_FILE,
 	OD_LSYSLOG,

src/od_instance.c

@@ -98,8 +98,8 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
 	rc = od_config_parse(&instance->config);
 	if (rc == -1)
 		return 1;
-	/* set log verbosity level */
-	od_logset_verbosity(&instance->log, instance->scheme.log_verbosity);
+	/* set log debug on/off */
+	od_logset_debug(&instance->log, instance->scheme.log_debug);
 	/* run as daemon */
 	if (instance->scheme.daemonize) {
 		rc = od_daemonize();
@@ -132,10 +132,8 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
 	if (rc == -1)
 		return 1;
 	/* print configuration scheme */
-	if (instance->scheme.log_verbosity >= 1) {
-		od_scheme_print(&instance->scheme, &instance->log);
-		od_log(&instance->log, "");
-	}
+	od_scheme_print(&instance->scheme, &instance->log);
+	od_log(&instance->log, "");
 	/* create pid file */
 	if (instance->scheme.pid_file)
 		od_pid_create(&instance->pid, instance->scheme.pid_file);

src/od_log.c

@@ -30,7 +30,7 @@
 
 int od_log_init(od_log_t *log, od_pid_t *pid, od_syslog_t *syslog)
 {
-	log->verbosity = 0;
+	log->debug = 0;
 	log->pid = pid;
 	log->syslog = syslog;
 	log->fd = 0;

src/od_log.h

@@ -12,7 +12,7 @@ typedef struct od_log od_log_t;
 struct od_log
 {
 	int          fd;
-	int          verbosity;
+	int          debug;
 	od_pid_t    *pid;
 	od_syslog_t *syslog;
 };
@@ -25,9 +25,9 @@ int od_logv(od_log_t*, od_syslogprio_t, char*,
 			char*, va_list);
 
 static inline void
-od_logset_verbosity(od_log_t *log, int level)
+od_logset_debug(od_log_t *log, int enable)
 {
-	log->verbosity = level;
+	log->debug = enable;
 }
 
 static inline int
@@ -65,6 +65,8 @@ od_log_client(od_log_t *log, uint64_t id, char *state, char *fmt, ...)
 static inline int
 od_debug_client(od_log_t *log, uint64_t id, char *state, char *fmt, ...)
 {
+	if (! log->debug)
+		return 0;
 	va_list args;
 	va_start(args, fmt);
 	int rc = od_logv(log, OD_SYSLOG_INFO, "debug:", "C", id, state, fmt, args);
@@ -97,6 +99,8 @@ od_log_server(od_log_t *log, uint64_t id, char *state, char *fmt, ...)
 static inline int
 od_debug_server(od_log_t *log, uint64_t id, char *state, char *fmt, ...)
 {
+	if (! log->debug)
+		return 0;
 	va_list args;
 	va_start(args, fmt);
 	int rc = od_logv(log, OD_SYSLOG_INFO, "debug:", "S", id, state, fmt, args);

src/od_scheme.c

@@ -24,7 +24,7 @@ void od_scheme_init(od_scheme_t *scheme)
 {
 	scheme->config_file = NULL;
 	scheme->daemonize = 0;
-	scheme->log_verbosity = 1;
+	scheme->log_debug = 0;
 	scheme->log_file = NULL;
 	scheme->pid_file = NULL;
 	scheme->syslog = 0;
@@ -354,8 +354,8 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
 	od_log(log, "using configuration file '%s'",
 	       scheme->config_file);
 	od_log(log, "");
-	if (scheme->log_verbosity)
-		od_log(log, "log_verbosity %d", scheme->log_verbosity);
+	if (scheme->log_debug)
+		od_log(log, "log_debug %d", scheme->log_debug);
 	if (scheme->log_file)
 		od_log(log, "log_file %s", scheme->log_file);
 	if (scheme->pid_file)

src/od_scheme.h

@@ -97,7 +97,7 @@ struct od_scheme
 	int               server_id;
 	/* main */
 	int               daemonize;
-	int               log_verbosity;
+	int               log_debug;
 	char             *log_file;
 	char             *pid_file;
 	int               syslog;