pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polybar-msg: Better error messages

Browse Source 
If a single connection fails, other connections are kept intact.
This commit is contained in:
patrick96 2022-01-29 17:44:54 +01:00 committed by Patrick Ziegler
parent a8035a7f68
commit 69a2bf211a
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/polybar-msg.cpp
View File

@ -33,8 +33,8 @@ void error(const string& msg) {
throw std::runtime_error(msg); throw std::runtime_error(msg);
} }
void uv_error(int status, const string& msg) { void uv_error(int status, int pid, const string& msg) {
throw std::runtime_error(msg + " (" + uv_strerror(status) + ")"); fprintf(stderr, "%s: %s (PID: %d)\n", msg.c_str(), uv_strerror(status), pid);
} }
void usage(FILE* f, const string& parameters) { void usage(FILE* f, const string& parameters) {
@ -76,7 +76,7 @@ static vector<string> get_sockets() {
return sockets; return sockets;
} }
static void on_write(PipeHandle& conn, ipc::decoder& dec) { static void on_write(PipeHandle& conn, ipc::decoder& dec, int pid) {
conn.read_start( conn.read_start(
[&](const auto& e) { [&](const auto& e) {
try { try {
@ -88,19 +88,19 @@ static void on_write(PipeHandle& conn, ipc::decoder& dec) {
} }
}, },
[&]() { conn.close(); }, [&]() { conn.close(); },
[&](const auto& e) { [&, pid](const auto& e) {
conn.close(); conn.close();
uv_error(e.status, "There was an error while reading polybar's response"); uv_error(e.status, pid, "There was an error while reading polybar's response");
}); });
} }
static void on_connection(PipeHandle& conn, ipc::decoder& dec, const ipc::type_t type, const string& payload) { static void on_connection(PipeHandle& conn, ipc::decoder& dec, int pid, const ipc::type_t type, const string& payload) {
const auto data = ipc::encode(type, payload); const auto data = ipc::encode(type, payload);
conn.write( conn.write(
data, [&]() { on_write(conn, dec); }, data, [&, pid]() { on_write(conn, dec, pid); },
[&](const auto& e) { [&, pid](const auto& e) {
conn.close(); conn.close();
uv_error(e.status, "There was an error while sending the IPC message."); uv_error(e.status, pid, "There was an error while sending the IPC message.");
}); });
} }
@ -229,7 +229,7 @@ int run(int argc, char** argv) {
logger null_logger{loglevel::NONE}; logger null_logger{loglevel::NONE};
/* /*
* Store all decoreds in vector so that they're alive for the whole eventloop. * Store all decoders in vector so that they're alive for the whole eventloop.
*/ */
vector<ipc::decoder> decoders; vector<ipc::decoder> decoders;
@ -265,7 +265,9 @@ int run(int argc, char** argv) {
auto& conn = loop.handle<PipeHandle>(); auto& conn = loop.handle<PipeHandle>();
conn.connect( conn.connect(
channel, channel,
[&conn, &decoders, type, payload, channel, idx]() { on_connection(conn, decoders[idx], type, payload); }, [&conn, &decoders, pid, type, payload, channel, idx]() {
on_connection(conn, decoders[idx], pid, type, payload);
},
[&](const auto& e) { [&](const auto& e) {
fprintf(stderr, "%s: Failed to connect to '%s' (err: '%s')\n", exec, channel.c_str(), uv_strerror(e.status)); fprintf(stderr, "%s: Failed to connect to '%s' (err: '%s')\n", exec, channel.c_str(), uv_strerror(e.status));
success = false; success = false;