diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2020-02-10 21:25:07 -0500 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-02-11 16:02:11 +0100 |
| commit | 33a984bbc5c5ec4202f24bacf6ddd584b95a9ec0 (patch) | |
| tree | 1f1f14d6aede50cf2abcaf9fe4baa7c7190ee34d | |
| parent | 31a83bd48d9aad2a039565fc39f1a52bd0cdf17d (diff) | |
config: fix validation exit code and log level
This makes it so invalid configs will return the exit code 1 when the
validation flag is given. This also reduces the log level to SWAY_ERROR,
which makes it so only the errors are shown. If someone wants more
verbose output, the can use the -V/--verbose or -d/--debug flags.
Additionally, this also makes it so swaybg will not be spawned when
validating the config.
| -rw-r--r-- | sway/commands/output.c | 2 | ||||
| -rw-r--r-- | sway/config.c | 2 | ||||
| -rw-r--r-- | sway/main.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/output.c b/sway/commands/output.c index 2790bd63..013f17b2 100644 --- a/sway/commands/output.c +++ b/sway/commands/output.c @@ -103,7 +103,7 @@ struct cmd_results *cmd_output(int argc, char **argv) { // If reloading, the output configs will be applied after reading the // entire config and before the deferred commands so that an auto generated // workspace name is not given to re-enabled outputs. - if (!config->reloading) { + if (!config->reloading && !config->validating) { apply_output_config_to_outputs(output); if (background) { spawn_swaybg(); diff --git a/sway/config.c b/sway/config.c index 6d730f46..c20625cf 100644 --- a/sway/config.c +++ b/sway/config.c @@ -404,7 +404,7 @@ static bool load_config(const char *path, struct sway_config *config, sway_log(SWAY_ERROR, "Error(s) loading config!"); } - return true; + return config->active || !config->validating || config_load_success; } bool load_main_config(const char *file, bool is_active, bool validating) { diff --git a/sway/main.c b/sway/main.c index d4585f73..bd6c1ae4 100644 --- a/sway/main.c +++ b/sway/main.c @@ -315,7 +315,7 @@ int main(int argc, char **argv) { if (debug) { sway_log_init(SWAY_DEBUG, sway_terminate); wlr_log_init(WLR_DEBUG, NULL); - } else if (verbose || validate) { + } else if (verbose) { sway_log_init(SWAY_INFO, sway_terminate); wlr_log_init(WLR_INFO, NULL); } else { |