Merge lp:~jamesh/bzr-dbus/kill-broadcast-daemon into lp:bzr-dbus

Proposed by James Henstridge
Status: Work in progress
Proposed branch: lp:~jamesh/bzr-dbus/kill-broadcast-daemon
Merge into: lp:bzr-dbus
Prerequisite: lp:~jamesh/bzr-dbus/server-signals
To merge this branch: bzr merge lp:~jamesh/bzr-dbus/kill-broadcast-daemon
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Needs Fixing
Robert Collins Pending
Review via email: mp+175@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

This branch gets rid of the need for a separate broadcast daemon. Instead, "bzr serve" instances advertise their prefix mappings directly over the bus via signal broadcasts. They can also readvertise themselves on request to handle the case where the server starts before the signal receiver.

Similarly, commands that update branch tips now send broadcast signals over the bus directly rather than performing a method call to the broadcast daemon and having it broadcast the signal.

The lan-notify code has been updated to handle the direct signal broadcasts. The possibility remains to support fixed prefix mappings by getting lan-notify to load them on startup from a configuration file.

One out-of-tree user of the bzr-dbus signals is bzr-gtk's notification icon code. It has already been updated to handle signals from any source, so works correctly with and without this patch.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

This would be a really nice thing to have, but unfortunately it no longer merges cleanly. I'm going to set it back to work in progress for the moment.

review: Needs Fixing (code)

Unmerged revisions

52. By James Henstridge

fix use of deprecated bzrlib API in tests

51. By James Henstridge

add back get_activity, which I accidentally removed when fixing conflicts

50. By James Henstridge

merge from head

49. By James Henstridge

merge in hook changes

48. By James Henstridge

merge bzr-dbus.bug-198645

47. By James Henstridge

Remove the IO watch on shutdown to clean up some spurious test output

46. By James Henstridge

make LanGateway acquire a bus name to prevent multiple lan-notify instances from running

45. By James Henstridge

merge from bzr-dbus/trunk

44. By James Henstridge

remove instructions for installing dbus service file

43. By James Henstridge

fix LanGateway constructor

Subscribers

People subscribed via source and target branches

to all changes: