mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-03-13 11:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

controller: Detach shell commands from polybar

Browse Source 
Shell commands triggered from action tags used to block polybar until
they finished.

Since we are not actually interested in the output of the commands, it
makes sense to run them completely detached from polybar and have
polybar not block when executing these commands.

Now the spawned child processes no longer get killed when polybar
exits. This is fine because polybar is not responsible for these
processes since they were explicitly started by the user through click
commands.

Ref: #770
Ref: #1680
This commit is contained in:
patrick96
2020-11-25 12:16:06 +01:00
committed by Patrick Ziegler
parent 0416093edc
commit 52eee95bf8
7 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/utils/command.cpp
View File

@ -1,12 +1,14 @@
#include "utils/command.hpp"
#include <sys/wait.h>
#include <unistd.h>
#include <csignal>
#include <cstdlib>
#include <utility>
#include <utils/string.hpp>
#include "errors.hpp"
#include "utils/command.hpp"
#include "utils/io.hpp"
#include "utils/process.hpp"
@ -31,20 +33,11 @@ command<output_policy::IGNORED>::~command() {
* Execute the command
*/
int command<output_policy::IGNORED>::exec(bool wait_for_completion) {
if ((m_forkpid = fork()) == -1) {
throw system_error("Failed to fork process");
}
if (process_util::in_forked_process(m_forkpid)) {
setpgid(m_forkpid, 0);
process_util::redirect_process_output_to_dev_null();
process_util::exec_sh(m_cmd.c_str());
} else {
if (wait_for_completion) {
auto status = wait();
m_forkpid = -1;
return status;
}
m_forkpid = process_util::fork_detached([m_cmd = m_cmd] { process_util::exec_sh(m_cmd.c_str()); });
if (wait_for_completion) {
auto status = wait();
m_forkpid = -1;
return status;
}
return EXIT_SUCCESS;
@ -90,7 +83,7 @@ int command<output_policy::IGNORED>::wait() {
}
} while (!WIFEXITED(m_forkstatus) && !WIFSIGNALED(m_forkstatus));
return m_forkstatus;
return WEXITSTATUS(m_forkstatus);
}
/**
@ -104,7 +97,7 @@ pid_t command<output_policy::IGNORED>::get_pid() {
* Get command exit status
*/
int command<output_policy::IGNORED>::get_exit_status() {
return m_forkstatus;
return WEXITSTATUS(m_forkstatus);
}
command<output_policy::REDIRECTED>::command(const polybar::logger& logger, std::string cmd)