Skip to content

Commit ba6c38c

Browse files
authored
Merge pull request #534 from sgotti/explicitly_create_services_local_directories
*: explicitly create services local directories
2 parents babcd6a + 802c9e5 commit ba6c38c

File tree

5 files changed

+40
-0
lines changed

5 files changed

+40
-0
lines changed

internal/services/configstore/configstore.go

+12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"context"
1919
"crypto/tls"
2020
"net/http"
21+
"os"
22+
"path/filepath"
2123
"sync"
2224
"time"
2325

@@ -89,6 +91,16 @@ func NewConfigstore(ctx context.Context, log zerolog.Logger, c *config.Configsto
8991
log = log.Level(zerolog.DebugLevel)
9092
}
9193

94+
if err := os.MkdirAll(c.DataDir, 0770); err != nil {
95+
return nil, errors.WithStack(err)
96+
}
97+
98+
if c.DB.Type == sql.Sqlite3 {
99+
if err := os.MkdirAll(filepath.Dir(c.DB.ConnString), 0770); err != nil {
100+
return nil, errors.WithStack(err)
101+
}
102+
}
103+
92104
ost, err := scommon.NewObjectStorage(ctx, &c.ObjectStorage)
93105
if err != nil {
94106
return nil, errors.WithStack(err)

internal/services/executor/executor.go

+4
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,10 @@ func NewExecutor(ctx context.Context, log zerolog.Logger, c *config.Executor) (*
14341434
},
14351435
}
14361436

1437+
if err := os.MkdirAll(c.DataDir, 0770); err != nil {
1438+
return nil, errors.WithStack(err)
1439+
}
1440+
14371441
if err := os.MkdirAll(e.tasksDir(), 0770); err != nil {
14381442
return nil, errors.WithStack(err)
14391443
}

internal/services/gitserver/main.go

+4
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ func NewGitserver(ctx context.Context, log zerolog.Logger, c *config.Gitserver)
132132
log = log.Level(zerolog.DebugLevel)
133133
}
134134

135+
if err := os.MkdirAll(c.DataDir, 0770); err != nil {
136+
return nil, errors.WithStack(err)
137+
}
138+
135139
return &Gitserver{
136140
log: log,
137141
c: c,

internal/services/notification/notification.go

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"context"
1919
"crypto/tls"
2020
"net/http"
21+
"os"
22+
"path/filepath"
2123
"sync"
2224
"time"
2325

@@ -65,6 +67,12 @@ func NewNotificationService(ctx context.Context, log zerolog.Logger, gc *config.
6567
log = log.Level(zerolog.DebugLevel)
6668
}
6769

70+
if c.DB.Type == sql.Sqlite3 {
71+
if err := os.MkdirAll(filepath.Dir(c.DB.ConnString), 0770); err != nil {
72+
return nil, errors.WithStack(err)
73+
}
74+
}
75+
6876
sdb, err := sql.NewDB(c.DB.Type, c.DB.ConnString)
6977
if err != nil {
7078
return nil, errors.Wrapf(err, "new db error")

internal/services/runservice/runservice.go

+12
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import (
1818
"context"
1919
"crypto/tls"
2020
"net/http"
21+
"os"
22+
"path/filepath"
2123
"sync"
2224
"time"
2325

@@ -88,6 +90,16 @@ func NewRunservice(ctx context.Context, log zerolog.Logger, c *config.Runservice
8890
log = log.Level(zerolog.DebugLevel)
8991
}
9092

93+
if err := os.MkdirAll(c.DataDir, 0770); err != nil {
94+
return nil, errors.WithStack(err)
95+
}
96+
97+
if c.DB.Type == sql.Sqlite3 {
98+
if err := os.MkdirAll(filepath.Dir(c.DB.ConnString), 0770); err != nil {
99+
return nil, errors.WithStack(err)
100+
}
101+
}
102+
91103
ost, err := scommon.NewObjectStorage(ctx, &c.ObjectStorage)
92104
if err != nil {
93105
return nil, errors.WithStack(err)

0 commit comments

Comments
 (0)