nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Geary.Db: Disable SQL query logging by default again

Browse source 
Even just logging SQL queries is extremely verbose, and pushes a lot
of logging messages off the end of the buffer. So rework result logging
flag and code to apply to both again.

Re-merge Application.Client's SQL logging command line flags back into
one again.
This commit is contained in:
Michael Gratton 2020-04-17 08:49:33 +10:00
parent 53bdf9299d
commit 834b6eb4bf
5 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/client/application/application-client.vala
View file

@ -69,7 +69,6 @@ public class Application.Client : Gtk.Application {
private const string OPTION_LOG_REPLAY_QUEUE = "log-replay-queue";
private const string OPTION_LOG_SMTP = "log-smtp";
private const string OPTION_LOG_SQL = "log-sql";
private const string OPTION_LOG_SQL_RESULTS = "log-sql-results";
private const string OPTION_HIDDEN = "hidden";
private const string OPTION_NEW_WINDOW = "new-window";
private const string OPTION_QUIT = "quit";
@ -124,10 +123,7 @@ public class Application.Client : Gtk.Application {
N_("Log SMTP messages"), null },
{ OPTION_LOG_SQL, 0, 0, GLib.OptionArg.NONE, null,
/// Command line option
N_("Log database queries"), null },
{ OPTION_LOG_SQL_RESULTS, 0, 0, GLib.OptionArg.NONE, null,
/// Command line option
N_("Log database query results (generates lots of messages)"), null },
N_("Log database queries (generates lots of messages)"), null },
{ OPTION_QUIT, 'q', 0, GLib.OptionArg.NONE, null,
/// Command line option
N_("Perform a graceful quit"), null },
@ -946,13 +942,11 @@ public class Application.Client : Gtk.Application {
Geary.Smtp.ClientService.PROTOCOL_LOGGING_DOMAIN
);
}
if (!options.contains(OPTION_LOG_SQL) &&
!options.contains(OPTION_LOG_SQL_RESULTS)) {
if (options.contains(OPTION_LOG_SQL)) {
Geary.Db.Context.enable_sql_logging = true;
} else {
Geary.Logging.suppress_domain(Geary.Db.Context.LOGGING_DOMAIN);
}
if (options.contains(OPTION_LOG_SQL_RESULTS)) {
Geary.Db.Result.log_results = true;
}
if (options.contains(OPTION_HIDDEN)) {
warning(