[RFC] config reload mechanism #1350

bynect · 2024-05-02T16:39:47Z

I wanted to add a way to reload the config files. part of the code is taken from #968.

In respect to #968 I added the ability to pass a list of config files to use to the dbus method. If none are passed it will use the old config list.

I noticed that the cmdline parser ignores multiple -conf options (without any acknowledgment of the fact). So I changed the behavior to accept a list of files.

Summary

Add dbus method ConfigReload
Refactor cmdline parsing to account for multiple -conf values
Cleanup wayland output on deinit
Update tests and documentation
Add dunstctl reload and completions
Keep original notification state for reload

bynect · 2024-05-02T17:53:46Z

@zappolowski it seems like the ci is having a problem with arch

maybe it's https://bbs.archlinux.org/viewtopic.php?id=276422?

codecov-commenter · 2024-05-02T19:05:48Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 41.28440% with 128 lines in your changes missing coverage. Please review.

Project coverage is 65.37%. Comparing base (20033b8) to head (703bc5a).
Report is 6 commits behind head on master.

Files	Patch %	Lines
src/rules.c	35.71%	63 Missing ⚠️
src/dunst.c	0.00%	24 Missing ⚠️
src/wayland/wl.c	0.00%	14 Missing ⚠️
src/dbus.c	47.36%	10 Missing ⚠️
src/queues.c	0.00%	9 Missing ⚠️
src/option_parser.c	83.33%	3 Missing ⚠️
src/settings.c	66.66%	3 Missing ⚠️
src/draw.c	0.00%	1 Missing ⚠️
test/icon-lookup.c	0.00%	1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1350      +/-   ##
==========================================
- Coverage   66.08%   65.37%   -0.72%     
==========================================
  Files          50       50              
  Lines        8247     8326      +79     
  Branches      958     1000      +42     
==========================================
- Hits         5450     5443       -7     
- Misses       2797     2883      +86

Flag	Coverage Δ
unittests	`65.37% <41.28%> (-0.72%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bynect · 2024-05-03T22:53:05Z

mostly done. I'll do some more checks and maybe add a functional test

main.c

src/dunst.c

src/queues.h

src/notification.c

fwsmit · 2024-05-06T05:25:52Z

Thanks for picking this up! I never got it to work properly when I tried it. But when the code is structured well, it should not be too hard to implement

src/dunst.c

bynect · 2024-05-07T11:00:54Z

Thanks for picking this up! I never got it to work properly when I tried it. But when the code is structured well, it should not be too hard to implement

I made some updates. The only thing I am a bit unsure is the reapply of rules

bynect · 2024-05-28T23:27:05Z

Basically I added a rule struct inside the notification that is allocated and filled when we try to apply a rule to change a value. Then when we reload we reapply that rule to "revert" the original state.
it should work but I haven't tested much (it is kind of involved)

@fwsmit does this solve the problem you said in the comments?

bynect · 2024-05-29T09:01:56Z

arch ci is not working ...

dunstctl

completions/dunstctl.fishcomp

src/queues.c

src/rules.c

src/settings.c

src/wayland/wl.c

bynect · 2024-07-01T12:31:11Z

@zappolowski I made the changes you suggested. Did you try hot reloading and found any problem? I wanted to merge this soon

docs/dunstctl.pod

src/wayland/wl.c

bynect · 2024-07-10T10:43:13Z

@fwsmit @zappolowski I finished. Also updated the docs. Can I merge this? wanted to release a version in this month what do you think?

fwsmit · 2024-07-14T14:59:41Z

Looks good to me!

bynect · 2024-07-15T09:26:10Z

I'll merge then

Fxzzi · 2024-09-25T21:23:26Z

seems like running dunstctl reload whilst a notification on screen causes dunst to stop working.

bynect · 2024-09-26T07:36:23Z

seems like running dunstctl reload whilst a notification on screen causes dunst to stop working.

How so? It should just reapply the config to the notification

Dreuzz · 2024-09-28T22:39:33Z

dunstctl reload /home/dreuzzz/.cache/wal/dunst

Error org.freedesktop.DBus.Error.UnknownMethod: No such method “ConfigReload”
Failed to communicate with dunst, is it running? Or maybe the version is outdated. You can try 'dunstctl debug' as a next debugging step.

bynect · 2024-09-29T09:43:20Z

dunstctl reload /home/dreuzzz/.cache/wal/dunst

Error org.freedesktop.DBus.Error.UnknownMethod: No such method “ConfigReload” Failed to communicate with dunst, is it running? Or maybe the version is outdated. You can try 'dunstctl debug' as a next debugging step.

this means that the running version of dunst is not updated and doesn't have the reload patch.

Dreuzz · 2024-09-29T10:23:55Z

dunst -v

Dunst - A customizable and lightweight notification-daemon v1.11.0-76-gc1cc6d1
Compiled on 2024-09-29 with the following options:
X11 support: enabled
Wayland support: enabled
SYSCONFDIR set to: /usr/local/etc/xdg
Compiler flags: -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Os -pthread -MMD -MP
Linker flags: -lm -lrt -lgio-2.0 -lgdk_pixbuf-2.0 -lglib-2.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lharfbuzz -lcairo -lwayland-client -lwayland-cursor -lX11 -lXinerama -lXext -lXrandr -lXss

bynect · 2024-09-29T12:02:31Z

dunst -v

Dunst - A customizable and lightweight notification-daemon v1.11.0-76-gc1cc6d1 Compiled on 2024-09-29 with the following options: X11 support: enabled Wayland support: enabled SYSCONFDIR set to: /usr/local/etc/xdg Compiler flags: -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Os -pthread -MMD -MP Linker flags: -lm -lrt -lgio-2.0 -lgdk_pixbuf-2.0 -lglib-2.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lharfbuzz -lcairo -lwayland-client -lwayland-cursor -lX11 -lXinerama -lXext -lXrandr -lXss

you are using master branch right? You have to make sure that the program actually running is this one. sometimes the build systems/package managers start a different binary than the one in path

B1ack3ye · 2024-10-04T19:43:20Z

On my Arch installation, dunstctl reload is not working:

[b1ack3ye@Black-PC ~]$ dunst -v
Dunst - A customizable and lightweight notification-daemon 1.11.0 (2024-04-15)
[b1ack3ye@Black-PC ~]$ dunstctl reload
dunstctl: unrecognized command 'reload'. Please consult the usage.
[b1ack3ye@Black-PC ~]$ dunstify "Test"
[b1ack3ye@Black-PC ~]$ dunstctl reload
dunstctl: unrecognized command 'reload'. Please consult the usage.

zappolowski · 2024-10-05T05:06:48Z

@B1ack3ye this feature is not yet released. If you want to it you either have to build it yourself or use dunst-git from AUR.

Fxzzi · 2024-10-05T12:19:23Z

seems like running dunstctl reload whilst a notification on screen causes dunst to stop working.

How so? It should just reapply the config to the notification

yeah, which is what I'm thinking, however afterwards no notifications show up. For now I just pkill dunst and it starts itself up again next time a notification is sent.

bynect · 2024-10-06T13:16:06Z

seems like running dunstctl reload whilst a notification on screen causes dunst to stop working.

How so? It should just reapply the config to the notification

yeah, which is what I'm thinking, however afterwards no notifications show up. For now I just pkill dunst and it starts itself up again next time a notification is sent.

do you mean when reloading all the notifications are closed? or when new notifications come nothing show up? it would be very helpful to provide a debug log (dunst -verbosity debug)

Fxzzi · 2024-10-06T13:24:33Z

do you mean when reloading all the notifications are closed? or when new notifications come nothing show up?

Both. current notifications close, and no new notifications show up.

it would be very helpful to provide a debug log (dunst -verbosity debug)

sure, here u go. https://paste.rs/xSpVi.txt

in this log, i simply launched dunst with verbosity, triggered my volume notification, and then did a dunstctl reload

bynect · 2024-10-06T13:48:46Z

do you mean when reloading all the notifications are closed? or when new notifications come nothing show up?

Both. current notifications close, and no new notifications show up.

it would be very helpful to provide a debug log (dunst -verbosity debug)

sure, here u go. https://paste.rs/xSpVi.txt

in this log, i simply launched dunst with verbosity, triggered my volume notification, and then did a dunstctl reload

Are you using wayland right? Since I can only test on xorg maybe this is a wayland only bug. could you try using dunst in Xwayland mode to see if this works there?

Fxzzi · 2024-10-06T17:31:26Z

Are you using wayland right? Since I can only test on xorg maybe this is a wayland only bug. could you try using dunst in Xwayland mode to see if this works there?

yep, I'm running on wayland.

bynect added 5 commits May 2, 2024 17:59

Allow multiple -conf values and refactor cmdline persing

f60261e

Implement config reloading

4d46e21

Add wayland cleanup

8556ba6

Update tests

8c8011b

Various fixes

467544d

bynect requested review from fwsmit and zappolowski May 2, 2024 17:54

bynect marked this pull request as ready for review May 3, 2024 08:02

bynect added 2 commits May 4, 2024 00:37

Update completions and manual

af14118

Merge master branch

640cb36

bynect force-pushed the reload branch from 6f48a46 to 640cb36 Compare May 3, 2024 22:44

fwsmit requested changes May 6, 2024

View reviewed changes

main.c Outdated Show resolved Hide resolved

src/dunst.c Outdated Show resolved Hide resolved

src/queues.h Show resolved Hide resolved

src/notification.c Outdated Show resolved Hide resolved

fwsmit reviewed May 6, 2024

View reviewed changes

src/dunst.c Show resolved Hide resolved

bynect mentioned this pull request May 6, 2024

[meta] Aesthetics & customization #1289

Open

bynect added 3 commits May 7, 2024 11:55

Merge branch 'master' of github.com:dunst-project/dunst into reload

409d093

Readibility fixes

996ba9e

Add functional test for reload

9d693f5

This was referenced May 22, 2024

Dunst maintenance status #1117

Closed

Dunstctl restart #1356

Closed

bynect added 3 commits May 29, 2024 01:01

Save original notification

6053e03

Prevent memleak

1d05558

Use original notification when reloading

b6829d9

bynect requested a review from fwsmit May 28, 2024 23:24

Update docs

e8c7a2c

bynect force-pushed the reload branch from ef46e9c to e8c7a2c Compare May 29, 2024 09:00

zappolowski reviewed Jun 26, 2024

View reviewed changes

Cleanup

98a516b

fwsmit reviewed Jul 2, 2024

View reviewed changes

docs/dunstctl.pod Outdated Show resolved Hide resolved

src/wayland/wl.c Show resolved Hide resolved

bynect added 2 commits July 2, 2024 13:27

Save only the original configs

bbf6d51

Update dunstctl.pod

2ee7449

fwsmit approved these changes Jul 14, 2024

View reviewed changes

Fix

703bc5a

bynect merged commit 844167a into dunst-project:master Jul 15, 2024
21 checks passed

This was referenced Jul 15, 2024

How to configure appearence on the fly ? #1120

Closed

Reload config by SIGUSR1 #719

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RFC] config reload mechanism #1350

[RFC] config reload mechanism #1350

bynect commented May 2, 2024 •

edited

Loading

bynect commented May 2, 2024

codecov-commenter commented May 2, 2024 •

edited

Loading

bynect commented May 3, 2024

fwsmit commented May 6, 2024

bynect commented May 7, 2024

bynect commented May 28, 2024

bynect commented May 29, 2024

bynect commented Jul 1, 2024

bynect commented Jul 10, 2024

fwsmit commented Jul 14, 2024

bynect commented Jul 15, 2024

Fxzzi commented Sep 25, 2024

bynect commented Sep 26, 2024

Dreuzz commented Sep 28, 2024 •

edited

Loading

bynect commented Sep 29, 2024

Dreuzz commented Sep 29, 2024 •

edited

Loading

bynect commented Sep 29, 2024 •

edited

Loading

B1ack3ye commented Oct 4, 2024

zappolowski commented Oct 5, 2024

Fxzzi commented Oct 5, 2024

bynect commented Oct 6, 2024

Fxzzi commented Oct 6, 2024

bynect commented Oct 6, 2024

Fxzzi commented Oct 6, 2024 •

edited

Loading

[RFC] config reload mechanism #1350

[RFC] config reload mechanism #1350

Conversation

bynect commented May 2, 2024 • edited Loading

Summary

bynect commented May 2, 2024

codecov-commenter commented May 2, 2024 • edited Loading

Codecov Report

bynect commented May 3, 2024

fwsmit commented May 6, 2024

bynect commented May 7, 2024

bynect commented May 28, 2024

bynect commented May 29, 2024

bynect commented Jul 1, 2024

bynect commented Jul 10, 2024

fwsmit commented Jul 14, 2024

bynect commented Jul 15, 2024

Fxzzi commented Sep 25, 2024

bynect commented Sep 26, 2024

Dreuzz commented Sep 28, 2024 • edited Loading

bynect commented Sep 29, 2024

Dreuzz commented Sep 29, 2024 • edited Loading

bynect commented Sep 29, 2024 • edited Loading

B1ack3ye commented Oct 4, 2024

zappolowski commented Oct 5, 2024

Fxzzi commented Oct 5, 2024

bynect commented Oct 6, 2024

Fxzzi commented Oct 6, 2024

bynect commented Oct 6, 2024

Fxzzi commented Oct 6, 2024 • edited Loading

bynect commented May 2, 2024 •

edited

Loading

codecov-commenter commented May 2, 2024 •

edited

Loading

Dreuzz commented Sep 28, 2024 •

edited

Loading

Dreuzz commented Sep 29, 2024 •

edited

Loading

bynect commented Sep 29, 2024 •

edited

Loading

Fxzzi commented Oct 6, 2024 •

edited

Loading