A cmd/msmtpqd/flag.go => cmd/msmtpqd/flag.go +55 -0
@@ 0,0 1,55 @@
+package main
+
+import (
+ "sync"
+)
+
+type Flag struct {
+ value bool
+ mu sync.Mutex
+ chTrue []chan bool
+ chFalse []chan bool
+}
+
+func NewFlag(value bool) *Flag {
+ return &Flag{
+ value: value,
+ chTrue: []chan bool{},
+ chFalse: []chan bool{},
+ }
+}
+
+func (f *Flag) Get() bool {
+ f.mu.Lock()
+ defer f.mu.Unlock()
+ return f.value
+}
+
+func (f *Flag) Set(value bool) {
+ f.mu.Lock()
+ defer f.mu.Unlock()
+ f.value = value
+
+ var chans []chan bool
+ if value {
+ chans = f.chTrue
+ } else {
+ chans = f.chFalse
+ }
+ for _, ch := range chans {
+ ch <- value
+ }
+}
+
+func (f *Flag) ChanFor(value bool) chan bool {
+ f.mu.Lock()
+ defer f.mu.Unlock()
+
+ ch := make(chan bool)
+ if value {
+ f.chTrue = append(f.chTrue, ch)
+ } else {
+ f.chFalse = append(f.chFalse, ch)
+ }
+ return ch
+}
M cmd/msmtpqd/worker.go => cmd/msmtpqd/worker.go +4 -4
@@ 8,7 8,6 @@ import (
"github.com/Schnouki/msmtpq"
- "github.com/Mischanix/wait"
"github.com/Schnouki/notify"
"github.com/gosexy/gettext"
log "github.com/sirupsen/logrus"
@@ 21,7 20,7 @@ const (
type Flusher struct {
queue *msmtpq.Queue
- flag *wait.Flag
+ flag *Flag
delay time.Duration
left int
notif *notify.Notification
@@ 39,7 38,7 @@ func NewFlusher() (*Flusher, error) {
return &Flusher{
queue: queue,
- flag: wait.NewFlag(false),
+ flag: NewFlag(false),
delay: DELAY_MIN,
left: len(msgs),
notif: notify.New("msmtpq", "", "", "mail_generic", notify.Timeout(), notify.NormalUrgency),
@@ 182,11 181,12 @@ func (f *Flusher) sendMessage(msg *msmtpq.Message) bool {
func (f *Flusher) Run() {
f.runOnce()
+ flagTrue := f.flag.ChanFor(true)
for {
log.Debugf(gettext.Gettext("Flusher delay is %d seconds"), f.delay/1e9)
select {
- case <-f.flag.ChanFor(true):
+ case <-flagTrue:
log.Debug(gettext.Gettext("Flusher woken up by explicit request!"))
f.flag.Set(false)
f.delay = DELAY_MIN
M go.mod => go.mod +12 -9
@@ 2,22 2,25 @@ module github.com/Schnouki/msmtpq
require (
github.com/Merovius/systemd v0.0.0-20140203230105-93296c743739
- github.com/Mischanix/wait v0.0.0-20130720164955-fce457d62843
github.com/Schnouki/notify v0.0.0-20141119231007-3ea8401e3d67
- github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3
+ github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3 // indirect
github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da
github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536
github.com/fatih/color v1.7.0
github.com/godbus/dbus v4.1.0+incompatible
- github.com/google/pprof v0.0.0-20180905154544-84b7d314e22c // indirect
github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a
- github.com/ianlancetaylor/demangle v0.0.0-20180714043527-fcd258a6f0b4 // indirect
- github.com/mattn/go-colorable v0.0.0-20180310133214-efa589957cd0
- github.com/mattn/go-isatty v0.0.4
+ github.com/goulash/notify v0.0.0-20150124153316-e7b476ada545 // indirect
+ github.com/mattn/go-colorable v0.0.0-20180310133214-efa589957cd0 // indirect
+ github.com/mattn/go-isatty v0.0.4 // indirect
+ github.com/onsi/ginkgo v1.10.3 // indirect
+ github.com/onsi/gomega v1.7.1 // indirect
github.com/sirupsen/logrus v1.0.5
+ github.com/stretchr/testify v1.4.0 // indirect
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3
- golang.org/x/arch v0.0.0-20180516175055-5de9028c2478 // indirect
- golang.org/x/crypto v0.0.0-20180619200235-7f39a6fea4fe
- golang.org/x/sys v0.0.0-20180620133508-ad87a3a340fa
+ golang.org/x/crypto v0.0.0-20180619200235-7f39a6fea4fe // indirect
+ gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/alexcesaro/quotedprintable.v2 v2.0.0-20150314193201-9b4a113f96b3
+ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
)
+
+go 1.13
M go.sum => go.sum +42 -10
@@ 1,38 1,70 @@
github.com/Merovius/systemd v0.0.0-20140203230105-93296c743739 h1:d0R557sdCXDZv2MEuI7RSzDiagCQ+giqcCeC+WbxahA=
github.com/Merovius/systemd v0.0.0-20140203230105-93296c743739/go.mod h1:M+KPe4nwX0QffLlO8bqWDoUiSiaSdY5gY25Ny3ibybI=
-github.com/Mischanix/wait v0.0.0-20130720164955-fce457d62843 h1:GayAfuYGpzY2N0YySDOF5kB1b6cQ3ONpp+JUulKJQH4=
-github.com/Mischanix/wait v0.0.0-20130720164955-fce457d62843/go.mod h1:wlgZ5jCpixvhINWkeGXhO166gxloGAH+6zuxnjza0as=
github.com/Schnouki/notify v0.0.0-20141119231007-3ea8401e3d67 h1:KFMe4mR/ThuDkf456/ScYGjmLfsjcF7NQL0OjhWp3to=
github.com/Schnouki/notify v0.0.0-20141119231007-3ea8401e3d67/go.mod h1:/WyZYCWgUBaaHemEqwcuB0/EtOfN6S90Ye3sjB361Co=
github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3 h1:h/wTyTK7VVFaSLpGFKLPkEYiWuloHpStKd30EZIaL9I=
github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da h1:0qwwqQCLOOXPl58ljnq3sTJR7yRuMolM02vjxDh4ZVE=
github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da/go.mod h1:ns+zIWBBchgfRdxNgIJWn2x6U95LQchxeqiN5Cgdgts=
github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536 h1:rHnpq7uNlix5l7tWZ55iJcHHrxCPnOVF4FGb7qOT2Jc=
github.com/docopt/docopt-go v0.0.0-20160216232012-784ddc588536/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-github.com/google/pprof v0.0.0-20180905154544-84b7d314e22c h1:ff6hg8bk8hxyB/a4tFCaxfpT5gOZIEqvhcKnb4FN7gI=
-github.com/google/pprof v0.0.0-20180905154544-84b7d314e22c/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a h1:N2b2mb4Gki1SlF3WuhR9P1YHOpl7oy/b+xxX4A3iM2E=
github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a/go.mod h1:IEJaV4/6J0VpoQ33kFCUUP6umRjrcBVEbOva6XCub/Q=
-github.com/ianlancetaylor/demangle v0.0.0-20180714043527-fcd258a6f0b4 h1:eWmTY5/yaZWgZR+HjyGOCXgM++IEwo/KgxxtYhai4LU=
-github.com/ianlancetaylor/demangle v0.0.0-20180714043527-fcd258a6f0b4/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/goulash/notify v0.0.0-20150124153316-e7b476ada545 h1:+NhjW8eRyPHxGrAgFLL9diXoW1YtYHBmMS6Y82pRkDs=
+github.com/goulash/notify v0.0.0-20150124153316-e7b476ada545/go.mod h1:0knKomAWOsif1C3yI/AbmeBtnlju1bcST3jT4wLHGWs=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/mattn/go-colorable v0.0.0-20180310133214-efa589957cd0 h1:cDvUG90i1ssGJGqMNx2Ubbn+bx7VOzjdvQ45zpy0X4w=
github.com/mattn/go-colorable v0.0.0-20180310133214-efa589957cd0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3 h1:OoxbjfXVZyod1fmWYhI7SEyaD8B00ynP3T+D5GiyHOY=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.0.5 h1:8c8b5uO0zS4X6RPl/sd1ENwSkIc0/H2PaHxE3udaE8I=
github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 h1:shC1HB1UogxN5Ech3Yqaaxj1X/P656PPCB4RbojIJqc=
github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg=
-golang.org/x/arch v0.0.0-20180516175055-5de9028c2478 h1:fvOqz8ZzX1us9kyff4JaBYTLClOQbLu2TkJGizMew9w=
-golang.org/x/arch v0.0.0-20180516175055-5de9028c2478/go.mod h1:cYlCBUl1MsqxdiKgmc4uh7TxZfWSFLOGSRR090WDxt8=
golang.org/x/crypto v0.0.0-20180619200235-7f39a6fea4fe h1:SfgKf9nOqRADFtqYKr+2JhFTS7L7i1BRrU9ndm2Xjsc=
golang.org/x/crypto v0.0.0-20180619200235-7f39a6fea4fe/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sys v0.0.0-20180620133508-ad87a3a340fa h1:MUO6aP6ViFfqImh/3zU3O6QX3W2hFRzkkuCIQuUCOsM=
-golang.org/x/sys v0.0.0-20180620133508-ad87a3a340fa/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alexcesaro/quotedprintable.v2 v2.0.0-20150314193201-9b4a113f96b3 h1:oeB/ux+1n/XCMvII9SH7XL7WykayRzJPRVv2NNNfcbI=
gopkg.in/alexcesaro/quotedprintable.v2 v2.0.0-20150314193201-9b4a113f96b3/go.mod h1:50qiz2hIdY0uy1WZBsLdZyDeYfsOzCji1lsl3dGpQHM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
M i18n/fr_FR.po => i18n/fr_FR.po +22 -22
@@ 7,7 7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-10 12:41+0200\n"
+"POT-Creation-Date: 2019-11-24 21:28+0100\n"
"PO-Revision-Date: 2015-05-22 15:24+0200\n"
"Last-Translator: Thomas Jost <schnouki@schnouki.net>\n"
"Language-Team: French\n"
@@ 17,72 17,72 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: cmd/msmtpqd/worker.go:72
+#: cmd/msmtpqd/worker.go:71
#, c-format
msgid "%d is left in the queue."
msgid_plural "%d are left in the queue."
msgstr[0] "%d restant en attente"
msgstr[1] "%d restants en attente"
-#: cmd/msmtpqd/worker.go:69
+#: cmd/msmtpqd/worker.go:68
#, c-format
msgid "%d message in queue"
msgid_plural "%d messages in queue"
msgstr[0] "%d message en attente"
msgstr[1] "%d messages en attente"
-#: cmd/msmtpqd/worker.go:125
+#: cmd/msmtpqd/worker.go:124
#, c-format
msgid "%d message sent"
msgid_plural "%d messages sent"
msgstr[0] "%d message envoyé"
msgstr[1] "%d messages envoyés"
-#: cmd/msmtpqd/worker.go:71
+#: cmd/msmtpqd/worker.go:70
#, c-format
msgid "%d message was sent; "
msgid_plural "%d messages were sent; "
msgstr[0] "%d message a été envoyé ; "
msgstr[1] "%d messages ont été envoyés ; "
-#: cmd/msmtpqd/worker.go:128
+#: cmd/msmtpqd/worker.go:127
#, c-format
msgid "; %d error"
msgid_plural "; %d errors"
msgstr[0] " ; %d erreur"
msgstr[1] " ; %d erreurs"
-#: cmd/msmtpqd/worker.go:126
+#: cmd/msmtpqd/worker.go:125
#, c-format
msgid "; %d left in the queue"
msgid_plural "; %d left in the queue"
msgstr[0] " ; %d restant en attente"
msgstr[1] " ; %d restants en attente"
-#: cmd/msmtpqd/worker.go:108
+#: cmd/msmtpqd/worker.go:107
#, c-format
msgid "; %d message left in the queue"
msgid_plural "; %d messages left in the queue"
msgstr[0] " ; %d message restant en attente"
msgstr[1] " ; %d messages restants en attente"
-#: cmd/msmtpqd/worker.go:176
+#: cmd/msmtpqd/worker.go:175
msgid "Could not delete a message"
msgstr "Un message n'a pas pu être supprimé"
-#: cmd/msmtpqd/worker.go:83 cmd/msmtpqd/worker.go:162
+#: cmd/msmtpqd/worker.go:82 cmd/msmtpqd/worker.go:161
msgid "Could not lock the queue"
msgstr "Impossible d'obtenir un verrou sur la file"
-#: cmd/msmtpqd/worker.go:143
+#: cmd/msmtpqd/worker.go:142
msgid "Could not open file"
msgstr "Impossible d'ouvrir le fichier"
-#: cmd/msmtpqd/worker.go:92
+#: cmd/msmtpqd/worker.go:91
msgid "Could not read messages from the queue"
msgstr "Impossible de lire les messages en attente"
-#: cmd/msmtpqd/worker.go:154
+#: cmd/msmtpqd/worker.go:153
msgid "Could not unlock the queue"
msgstr "Impossible de déverrouiller la file"
@@ 107,7 107,7 @@ msgstr "Thread d'envoi réveillé par écoulement du délai d'attente !"
msgid "Flusher woken up by explicit request!"
msgstr "Thread d'envoi réveillé sur demande explicite !"
-#: cmd/msmtpqd/worker.go:78
+#: cmd/msmtpqd/worker.go:77
msgid "Flushing the queue…"
msgstr "Envoi de messages en attente…"
@@ 123,24 123,24 @@ msgstr "Initialisation du thread d'envoi…"
msgid "Log to journald"
msgstr "Utiliser journald"
-#: cmd/msmtpqd/worker.go:119
+#: cmd/msmtpqd/worker.go:118
#, c-format
msgid "Message %s was sent successfully."
msgstr "Le message %s a été envoyé avec succès"
-#: cmd/msmtpqd/worker.go:112
+#: cmd/msmtpqd/worker.go:111
msgid "Network is available: flushing the queue"
msgstr "Le réseau est disponible : vidage de la file"
-#: cmd/msmtpqd/worker.go:107
+#: cmd/msmtpqd/worker.go:106
msgid "Network unavailable"
msgstr "Réseau indisponible"
-#: cmd/msmtpqd/worker.go:106
+#: cmd/msmtpqd/worker.go:105
msgid "Network unavailable: not flushing the queue"
msgstr "Réseau indisponible : la file ne sera pas vidée"
-#: cmd/msmtpqd/worker.go:98
+#: cmd/msmtpqd/worker.go:97
msgid "No message in queue"
msgstr "Pas de message en attente"
@@ 152,7 152,7 @@ msgstr "Notification de systemd et activation du watchdog…"
msgid "Run in debug mode"
msgstr "Lancer en mode debug"
-#: cmd/msmtpqd/worker.go:116
+#: cmd/msmtpqd/worker.go:115
#, c-format
msgid "Sending message %s…"
msgstr "Envoi du message %s…"
@@ 161,7 161,7 @@ msgstr "Envoi du message %s…"
msgid "Starting the msmtp queue daemon…"
msgstr "Démarrage du démon de file d'attente msmtp…"
-#: cmd/msmtpqd/worker.go:102
+#: cmd/msmtpqd/worker.go:101
msgid "Testing if network is available…"
msgstr "Vérification de la disponibilité du réseau…"
@@ 169,6 169,6 @@ msgstr "Vérification de la disponibilité du réseau…"
msgid "Waiting for connections…"
msgstr "En attente de connections…"
-#: cmd/msmtpqd/worker.go:169
+#: cmd/msmtpqd/worker.go:168
msgid "msmtp exited with error"
msgstr "msmtp a terminé avec une erreur"