From 9f504f07f39a82359e979a45bd0e13042d9104df Mon Sep 17 00:00:00 2001
From: Geoff Greer <geoff@greer.fm>
Date: Fri, 15 Feb 2019 13:45:37 -0800
Subject: [PATCH] Replace broken debuglog command with log_level command.

---
 include/sway/commands.h   |  2 +-
 sway/commands.c           |  1 +
 sway/commands/log_level.c | 27 +++++++++++++++++++++++++++
 sway/meson.build          |  1 +
 sway/sway.5.scd           |  7 +++----
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 sway/commands/log_level.c

diff --git a/include/sway/commands.h b/include/sway/commands.h
index 3ed007635..354f7d448 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -112,7 +112,6 @@ sway_cmd cmd_client_placeholder;
 sway_cmd cmd_client_background;
 sway_cmd cmd_commands;
 sway_cmd cmd_create_output;
-sway_cmd cmd_debuglog;
 sway_cmd cmd_default_border;
 sway_cmd cmd_default_floating_border;
 sway_cmd cmd_default_orientation;
@@ -142,6 +141,7 @@ sway_cmd cmd_ipc;
 sway_cmd cmd_kill;
 sway_cmd cmd_layout;
 sway_cmd cmd_log_colors;
+sway_cmd cmd_log_level;
 sway_cmd cmd_mark;
 sway_cmd cmd_mode;
 sway_cmd cmd_mouse_warping;
diff --git a/sway/commands.c b/sway/commands.c
index 3fc4f86e4..4c012a872 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -74,6 +74,7 @@ static struct cmd_handler handlers[] = {
 	{ "hide_edge_borders", cmd_hide_edge_borders },
 	{ "include", cmd_include },
 	{ "input", cmd_input },
+	{ "log_level", cmd_log_level },
 	{ "mode", cmd_mode },
 	{ "mouse_warping", cmd_mouse_warping },
 	{ "new_float", cmd_default_floating_border },
diff --git a/sway/commands/log_level.c b/sway/commands/log_level.c
new file mode 100644
index 000000000..8aa4d3f0b
--- /dev/null
+++ b/sway/commands/log_level.c
@@ -0,0 +1,27 @@
+#include <stdlib.h>
+#include "sway/commands.h"
+#include "log.h"
+
+struct cmd_results *cmd_log_level(int argc, char **argv) {
+	struct cmd_results *error = NULL;
+	if ((error = checkarg(argc, "log_level", EXPECTED_EQUAL_TO, 1))) {
+		return error;
+	}
+
+	sway_log_importance_t verbosity;
+	if (strcmp(*argv, "debug") == 0) {
+		verbosity = SWAY_DEBUG;
+	} else if (strcmp(*argv, "info") == 0) {
+		verbosity = SWAY_INFO;
+	} else if (strcmp(*argv, "error") == 0) {
+		verbosity = SWAY_ERROR;
+	} else if (strcmp(*argv, "silent") == 0) {
+		verbosity = SWAY_SILENT;
+	} else {
+		return cmd_results_new(CMD_INVALID, "Invalid log_level option.");
+	}
+
+	sway_log_init(verbosity, NULL);
+
+	return cmd_results_new(CMD_SUCCESS, NULL);
+}
diff --git a/sway/meson.build b/sway/meson.build
index 293a4ed20..b24b0b08e 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -68,6 +68,7 @@ sway_sources = files(
 	'commands/include.c',
 	'commands/input.c',
 	'commands/layout.c',
+	'commands/log_level.c',
 	'commands/mode.c',
 	'commands/mouse_warping.c',
 	'commands/move.c',
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index fd0a22dc7..c0c606148 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -413,10 +413,6 @@ The default colors are:
 :  #0c0c0c
 
 
-*debuglog* on|off|toggle
-	Enables, disables or toggles debug logging. _toggle_ cannot be used in the
-	configuration file.
-
 *default_border* normal|none|pixel [<n>]
 	Set default border style for new tiled windows.
 
@@ -506,6 +502,9 @@ The default colors are:
 	devices. A list of input device names may be obtained via *swaymsg -t
 	get_inputs*.
 
+*log_level* debug|info|error|silent
+	Sets the logging verbosity. Default is error.
+
 *seat* <seat> <seat-subcommands...>
 	For details on seat subcommands, see *sway-input*(5).