odissey: add log_query on/off configuration tweak

odissey.conf

@@ -31,6 +31,7 @@ log_syslog_facility  "daemon"
 log_debug             yes
 log_config            yes
 log_session           yes
+log_query             no
 log_stats             yes
 stats_interval        3
 nodelay               yes

scripts/debian/config

@@ -14,6 +14,7 @@ log_format            "%p %l %c %i %s  %m\n"
 log_debug              no
 log_config             yes
 log_session            yes
+log_query              no
 log_stats              yes
 stats_interval         3
 readahead              16384

sources/config.c

@@ -45,6 +45,7 @@ enum
 	OD_LLOG_DEBUG,
 	OD_LLOG_CONFIG,
 	OD_LLOG_SESSION,
+	OD_LLOG_QUERY,
 	OD_LLOG_FILE,
 	OD_LLOG_FORMAT,
 	OD_LLOG_STATS,
@@ -114,6 +115,7 @@ static od_keyword_t od_config_keywords[] =
 	od_keyword("log_to_stdout",       OD_LLOG_TO_STDOUT),
 	od_keyword("log_config",          OD_LLOG_CONFIG),
 	od_keyword("log_session",         OD_LLOG_SESSION),
+	od_keyword("log_query",           OD_LLOG_QUERY),
 	od_keyword("log_file",            OD_LLOG_FILE),
 	od_keyword("log_format",          OD_LLOG_FORMAT),
 	od_keyword("log_stats",           OD_LLOG_STATS),
@@ -851,6 +853,11 @@ od_config_parse(od_config_t *config)
 			if (! od_config_next_yes_no(config, &scheme->log_session))
 				return -1;
 			continue;
+		/* log_query */
+		case OD_LLOG_QUERY:
+			if (! od_config_next_yes_no(config, &scheme->log_query))
+				return -1;
+			continue;
 		/* log_stats */
 		case OD_LLOG_STATS:
 			if (! od_config_next_yes_no(config, &scheme->log_stats))

sources/console.c

@@ -640,8 +640,10 @@ od_console_query(od_console_t *console, od_msgconsole_t *msg_console)
 	if (rc == -1)
 		goto bad_command;
 
-	od_debug(&instance->logger, "console", client, NULL,
-	         "%.*s", query_len, query);
+	if (instance->scheme.log_query) {
+		od_debug(&instance->logger, "console", client, NULL,
+		         "%.*s", query_len, query);
+	}
 
 	od_parser_t parser;
 	od_parser_init(&parser, query, query_len);

sources/frontend.c

@@ -422,7 +422,7 @@ od_frontend_remote(od_client_t *client)
 		         "%c", type);
 
 		/* Query */
-		if (type == 'Q') {
+		if (type == 'Q' && instance->scheme.log_query) {
 			uint32_t query_len;
 			char *query;
 			rc = shapito_be_read_query(&query, &query_len,

sources/scheme.c

@@ -30,6 +30,7 @@ void od_scheme_init(od_scheme_t *scheme)
 	scheme->log_to_stdout = 1;
 	scheme->log_config = 0;
 	scheme->log_session = 1;
+	scheme->log_query = 0;
 	scheme->log_file = NULL;
 	scheme->log_stats = 1;
 	scheme->stats_interval = 3;
@@ -842,6 +843,10 @@ void od_scheme_print(od_scheme_t *scheme, od_logger_t *logger, int routes_only)
 		od_log(logger, "config", NULL, NULL,
 		       "log_session         %s",
 		       od_scheme_yes_no(scheme->log_session));
+	if (scheme->log_query)
+		od_log(logger, "config", NULL, NULL,
+		       "log_query           %s",
+		       od_scheme_yes_no(scheme->log_query));
 	if (scheme->log_stats)
 		od_log(logger, "config", NULL, NULL,
 		       "log_stats           %s",

sources/scheme.h

@@ -125,6 +125,7 @@ struct od_scheme
 	int        log_debug;
 	int        log_config;
 	int        log_session;
+	int        log_query;
 	char      *log_file;
 	char      *log_format;
 	int        log_stats;