Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 04:06:03 +00:00
Code Issues Releases Activity

conky.cc: quit on SIGHUP

Browse Source
This commit is contained in:
lasers 2018-08-29 09:11:54 -05:00
parent 788d5d816a
commit c0d5b6854e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/docs.xml
View File

@ -145,9 +145,8 @@
going to consume.
</para>
<para>An easy way to force Conky to reload your ~/.config/conky/conky.conf:
"killall -SIGUSR1 conky". Saves you the trouble of having
to kill and then restart. You can now also do the same with
SIGHUP.
"killall -SIGUSR1 conky". Saves you the trouble of having to kill
and then restart.
</para>
</refsect1>
<refsect1>
@ -173,7 +172,7 @@
<refsect1>
<title>Objects/Variables</title>
<para>Colours are parsed using XParsecolor(), there might be a
list of them: /usr/share/X11/rgb.txt.
list of them: /usr/share/X11/rgb.txt.
Colour can be also in
#rrggbb format (hex).
</para>

6
src/conky.cc
View File

@ -2411,7 +2411,7 @@ static void main_loop() {
if (g_sighup_pending != 0) {
g_sighup_pending = 0;
NORM_ERR("received SIGHUP or SIGUSR1. reloading the config file.");
NORM_ERR("received SIGUSR1. reloading the config file.");
reload_config();
}
@ -2432,7 +2432,7 @@ static void main_loop() {
if (g_sigterm_pending != 0) {
g_sigterm_pending = 0;
NORM_ERR("received SIGINT or SIGTERM to terminate. bye!");
NORM_ERR("received SIGHUP, SIGINT, or SIGTERM to terminate. bye!");
terminate = 1;
#ifdef BUILD_X11
if (out_to_x.get(*state)) {
@ -3185,11 +3185,11 @@ static void signal_handler(int sig) {
* and do any signal processing there, NOT here */
switch (sig) {
case SIGHUP:
case SIGINT:
case SIGTERM:
g_sigterm_pending = 1;
break;
case SIGHUP:
case SIGUSR1:
g_sighup_pending = 1;
break;