mirror of
https://github.com/tinyauthapp/tinyauth.git
synced 2026-09-18 07:23:32 +08:00
fix: rabbit comments
This commit is contained in:
@@ -2,6 +2,7 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"time"
|
||||||
@@ -17,6 +18,10 @@ import (
|
|||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrPingFailed = fmt.Errorf("failed to ping docker")
|
||||||
|
)
|
||||||
|
|
||||||
type DockerService struct {
|
type DockerService struct {
|
||||||
log *logger.Logger
|
log *logger.Logger
|
||||||
client *client.Client
|
client *client.Client
|
||||||
@@ -44,6 +49,10 @@ func NewDockerService(i DockerServiceInput) (*DockerService, error) {
|
|||||||
if os.Getenv("DOCKER_HOST") == "" {
|
if os.Getenv("DOCKER_HOST") == "" {
|
||||||
cli, err := service.connect()
|
cli, err := service.connect()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrPingFailed) {
|
||||||
|
service.log.App.Debug().Msg("Docker not connected")
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
return nil, fmt.Errorf("failed to connect to docker: %w", err)
|
return nil, fmt.Errorf("failed to connect to docker: %w", err)
|
||||||
}
|
}
|
||||||
service.client = cli
|
service.client = cli
|
||||||
@@ -65,11 +74,17 @@ func NewDockerService(i DockerServiceInput) (*DockerService, error) {
|
|||||||
return cli, nil
|
return cli, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err := backoff.Retry(service.context, operation, backoff.WithBackOff(exp), backoff.WithMaxTries(3))
|
cli, err := backoff.Retry(service.context, operation, backoff.WithBackOff(exp), backoff.WithMaxTries(3))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if errors.Is(err, ErrPingFailed) {
|
||||||
|
service.log.App.Debug().Msg("Docker not connected after retrying")
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
return nil, fmt.Errorf("failed to connect to docker after retrying: %w", err)
|
return nil, fmt.Errorf("failed to connect to docker after retrying: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
service.client = cli
|
||||||
}
|
}
|
||||||
|
|
||||||
service.isConnected = true
|
service.isConnected = true
|
||||||
@@ -90,8 +105,7 @@ func (docker *DockerService) connect() (*client.Client, error) {
|
|||||||
_, err = cli.Ping(docker.context)
|
_, err = cli.Ping(docker.context)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
docker.log.App.Debug().Err(err).Msg("Docker not connected")
|
return nil, ErrPingFailed
|
||||||
return nil, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return cli, nil
|
return cli, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user