Skip to content

Commit

Permalink
microcluster: Remove SocketDir as an App arg
Browse files Browse the repository at this point in the history
Signed-off-by: Wesley Hershberger <[email protected]>
  • Loading branch information
MggMuggins committed Jul 29, 2024
1 parent efdde8b commit 97444c0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions microcluster/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ type MicroCluster struct {

// Args contains options for configuring MicroCluster.
type Args struct {
StateDir string
SocketGroup string
StateDir string

Client *client.Client
Proxy func(*http.Request) (*url.URL, error)
Expand All @@ -54,7 +53,7 @@ func App(args Args) (*MicroCluster, error) {
if err != nil {
return nil, fmt.Errorf("Missing absolute state directory: %w", err)
}
os, err := sys.DefaultOS(stateDir, args.SocketGroup, true)
os, err := sys.DefaultOS(stateDir, true)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -84,7 +83,7 @@ func (m *MicroCluster) Start(ctx context.Context, daemonArgs DaemonArgs) error {
ctx, cancel := signal.NotifyContext(ctx, unix.SIGPWR, unix.SIGTERM, unix.SIGINT, unix.SIGQUIT)
defer cancel()

err = d.Run(ctx, m.FileSystem.StateDir, m.args.SocketGroup, daemonArgs)
err = d.Run(ctx, m.FileSystem.StateDir, daemonArgs)
if err != nil {
return fmt.Errorf("Daemon stopped with error: %w", err)
}
Expand Down

0 comments on commit 97444c0

Please sign in to comment.