blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

socket: use existing socket if it is connected

Browse source 
When using ephemeral aerc sessions – for example while writing patches
for it – the mailto: functionality breaks if the socket is removed.

Try to send a ping (an empty message) to the socket and remove it, if
the send fails or no noop reply is received.

Signed-off-by: Moritz Poldrack <git@moritz.sh>
Acked-by: Tim Culverhouse <tim@timculverhouse.com>
This commit is contained in:
Moritz Poldrack 2022-09-13 13:50:35 +02:00 committed by Robin Jarry
parent c947811e9f
commit 37c1db2ab2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/socket.go
View file

@ -24,8 +24,10 @@ type AercServer struct {
func StartServer() (*AercServer, error) { func StartServer() (*AercServer, error) {
sockpath := path.Join(xdg.RuntimeDir(), "aerc.sock") sockpath := path.Join(xdg.RuntimeDir(), "aerc.sock")
// remove the socket if it already exists // remove the socket if it is not connected to a session
os.Remove(sockpath) if err := ConnectAndExec(""); err != nil {
os.Remove(sockpath)
}
logging.Infof("Starting Unix server: %s", sockpath) logging.Infof("Starting Unix server: %s", sockpath)
l, err := net.Listen("unix", sockpath) l, err := net.Listen("unix", sockpath)
if err != nil { if err != nil {