mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-07 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup config reading failure error logs

Browse source 
This cleans up the log when sway fails to read a config file. The
following changes have been made:
- A missing error message has been added to the log when the config file
is a directory instead of a regular file
- In main, `goto` statements have been added after the `sway_terminate`
calls instead of wrapping every block in `if (!terminate_request)`
- Unnecessary NULL-checks around calls to free in `main` have been
removed
- Deferred command execution has been extracted to a separate function
and the `Running deferred commands` log message will not be shown when
there are no deferred commands.
This commit is contained in:
Brian Ashworth 2019-01-29 13:18:53 -05:00
parent f49ad5977e
commit f0fd6119cf
3 changed files with 39 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sway/main.c
View file

@ -16,7 +16,6 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/debug.h"
#include "sway/desktop/transaction.h"
#include "sway/server.h"
#include "sway/swaynag.h"
#include "sway/tree/root.h"
@ -370,55 +369,33 @@ int main(int argc, char **argv) {
setenv("WAYLAND_DISPLAY", server.socket, true);
if (!load_main_config(config_path, false, false)) {
sway_terminate(EXIT_FAILURE);
goto shutdown;
}
if (config_path) {
free(config_path);
}
if (!terminate_request) {
if (!server_start(&server)) {
sway_terminate(EXIT_FAILURE);
}
if (!server_start(&server)) {
sway_terminate(EXIT_FAILURE);
goto shutdown;
}
config->active = true;
load_swaybars();
// Execute commands until there are none left
sway_log(SWAY_DEBUG, "Running deferred commands");
while (config->cmd_queue->length) {
char *line = config->cmd_queue->items[0];
list_t *res_list = execute_command(line, NULL, NULL);
for (int i = 0; i < res_list->length; ++i) {
struct cmd_results *res = res_list->items[i];
if (res->status != CMD_SUCCESS) {
sway_log(SWAY_ERROR, "Error on line '%s': %s", line, res->error);
}
free_cmd_results(res);
}
list_free(res_list);
free(line);
list_del(config->cmd_queue, 0);
}
transaction_commit_dirty();
run_deferred_commands();
if (config->swaynag_config_errors.pid > 0) {
swaynag_show(&config->swaynag_config_errors);
}
if (!terminate_request) {
server_run(&server);
}
server_run(&server);
shutdown:
sway_log(SWAY_INFO, "Shutting down sway");
server_fini(&server);
root_destroy(root);
root = NULL;
if (config) {
free_config(config);
}
free(config_path);
free_config(config);
pango_cairo_font_map_set_default(NULL);