admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Only log subproc error when it's not nil

Browse Source
This commit is contained in:
Quentin McGaw
2021-01-30 18:07:12 +00:00
parent 75fdf7adab
commit 5757f0e201
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dns/loop.go
View File

@@ -70,7 +70,9 @@ func NewLooper(conf unbound.Configurator, settings settings.DNS, client *http.Cl
} }
func (l *looper) logAndWait(ctx context.Context, err error) { func (l *looper) logAndWait(ctx context.Context, err error) {
l.logger.Warn(err) if err != nil {
l.logger.Warn(err)
}
l.logger.Info("attempting restart in %s", l.backoffTime) l.logger.Info("attempting restart in %s", l.backoffTime)
timer := time.NewTimer(l.backoffTime) timer := time.NewTimer(l.backoffTime)
l.backoffTime *= 2 l.backoffTime *= 2

4
internal/openvpn/loop.go
View File

@@ -214,7 +214,9 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
} }
func (l *looper) logAndWait(ctx context.Context, err error) { func (l *looper) logAndWait(ctx context.Context, err error) {
l.logger.Error(err) if err != nil {
l.logger.Error(err)
}
l.logger.Info("retrying in %s", l.backoffTime) l.logger.Info("retrying in %s", l.backoffTime)
timer := time.NewTimer(l.backoffTime) timer := time.NewTimer(l.backoffTime)
l.backoffTime *= 2 l.backoffTime *= 2

4
internal/publicip/loop.go
View File

@@ -74,7 +74,9 @@ func NewLooper(client *http.Client, logger logging.Logger,
} }
func (l *looper) logAndWait(ctx context.Context, err error) { func (l *looper) logAndWait(ctx context.Context, err error) {
l.logger.Error(err) if err != nil {
l.logger.Error(err)
}
l.logger.Info("retrying in %s", l.backoffTime) l.logger.Info("retrying in %s", l.backoffTime)
timer := time.NewTimer(l.backoffTime) timer := time.NewTimer(l.backoffTime)
l.backoffTime *= 2 l.backoffTime *= 2

4
internal/shadowsocks/loop.go
View File

@@ -34,7 +34,9 @@ type looper struct {
} }
func (l *looper) logAndWait(ctx context.Context, err error) { func (l *looper) logAndWait(ctx context.Context, err error) {
l.logger.Error(err) if err != nil {
l.logger.Error(err)
}
l.logger.Info("retrying in %s", l.backoffTime) l.logger.Info("retrying in %s", l.backoffTime)
timer := time.NewTimer(l.backoffTime) timer := time.NewTimer(l.backoffTime)
l.backoffTime *= 2 l.backoffTime *= 2

4
internal/updater/loop.go
View File

@@ -69,7 +69,9 @@ func NewLooper(settings settings.Updater, currentServers models.AllServers,
} }
func (l *looper) logAndWait(ctx context.Context, err error) { func (l *looper) logAndWait(ctx context.Context, err error) {
l.logger.Error(err) if err != nil {
l.logger.Error(err)
}
l.logger.Info("retrying in %s", l.backoffTime) l.logger.Info("retrying in %s", l.backoffTime)
timer := time.NewTimer(l.backoffTime) timer := time.NewTimer(l.backoffTime)
l.backoffTime *= 2 l.backoffTime *= 2