nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4008 from orestisfl/limit-run_command-LOG 

Limit log length with IPC commands
This commit is contained in:
Ingo Bürk 2020-04-11 19:49:24 +02:00 committed by GitHub
parent 1e9fbd7186 964456b628
commit e47d5f6a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.c
View File

@ -766,7 +766,7 @@ void cmd_border(I3_CMD, const char *border_style_str, long border_width) {
*/ */
void cmd_nop(I3_CMD, const char *comment) { void cmd_nop(I3_CMD, const char *comment) {
LOG("-------------------------------------------------\n"); LOG("-------------------------------------------------\n");
LOG(" NOP: %s\n", comment); LOG(" NOP: %.4000s\n", comment);
LOG("-------------------------------------------------\n"); LOG("-------------------------------------------------\n");
ysuccess(true); ysuccess(true);
} }

2
src/commands_parser.c
View File

@ -263,7 +263,7 @@ char *parse_string(const char **walk, bool as_word) {
* Free the returned CommandResult with command_result_free(). * Free the returned CommandResult with command_result_free().
*/ */
CommandResult *parse_command(const char *input, yajl_gen gen, ipc_client *client) { CommandResult *parse_command(const char *input, yajl_gen gen, ipc_client *client) {
DLOG("COMMAND: *%s*\n", input); DLOG("COMMAND: *%.4000s*\n", input);
state = INITIAL; state = INITIAL;
CommandResult *result = scalloc(1, sizeof(CommandResult)); CommandResult *result = scalloc(1, sizeof(CommandResult));

5
src/ipc.c
View File

@ -217,15 +217,14 @@ void ipc_shutdown(shutdown_reason_t reason, int exempt_fd) {
} }
/* /*
* Executes the command and returns whether it could be successfully parsed * Executes the given command.
* or not (at the moment, always returns true).
* *
*/ */
IPC_HANDLER(run_command) { IPC_HANDLER(run_command) {
/* To get a properly terminated buffer, we copy /* To get a properly terminated buffer, we copy
* message_size bytes out of the buffer */ * message_size bytes out of the buffer */
char *command = sstrndup((const char *)message, message_size); char *command = sstrndup((const char *)message, message_size);
LOG("IPC: received: *%s*\n", command); LOG("IPC: received: *%.4000s*\n", command);
yajl_gen gen = yajl_gen_alloc(NULL); yajl_gen gen = yajl_gen_alloc(NULL);
CommandResult *result = parse_command(command, gen, client); CommandResult *result = parse_command(command, gen, client);