Skip to content

Commit 307902c

Browse files
committed
Moved db files to metadata dir
1 parent 454ec73 commit 307902c

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
dist/
22
.vscode
33
/clace
4-
clace.db*
5-
clace_app.db*
6-
clace_fs.db*
4+
metadata/
75
clace.toml
86
*.swp
97
.sw*

internal/server/server.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ type Server struct {
138138

139139
// NewServer creates a new instance of the Clace Server
140140
func NewServer(config *types.ServerConfig) (*Server, error) {
141+
metadataDir := os.ExpandEnv("$CL_HOME/metadata")
142+
if err := os.MkdirAll(metadataDir, 0700); err != nil {
143+
return nil, fmt.Errorf("error creating metadata directory %s : %w", metadataDir, err)
144+
}
145+
141146
l := types.NewLogger(&config.Log)
142147
db, err := metadata.NewMetadata(l, config)
143148
if err != nil {

internal/system/clace.default.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ access_logging = true
4545

4646
# Metadata Storage Config
4747
[metadata]
48-
db_connection = "sqlite:$CL_HOME/clace.db"
48+
db_connection = "sqlite:$CL_HOME/metadata/clace_metadata.db"
4949
auto_upgrade = true
5050

5151
[system]
@@ -59,10 +59,10 @@ root_serve_list_apps = "auto" # "auto" means serve list_apps app for defau
5959
# any other value means server for specified domain
6060

6161
[plugin."store.in"]
62-
db_connection = "sqlite:$CL_HOME/clace_app.db"
62+
db_connection = "sqlite:$CL_HOME/metdata/clace_app_store.db"
6363

6464
[plugin."fs.in"]
65-
db_connection = "sqlite:$CL_HOME/clace_fs.db"
65+
db_connection = "sqlite:$CL_HOME/metadata/clace_fs.db"
6666

6767
[app_config]
6868
# app config can be set at the app level using a metadata config update. For example:

internal/system/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestServerConfig(t *testing.T) {
3030
testutil.AssertEqualsInt(t, "max size MB", 50, c.Log.MaxSizeMB)
3131

3232
// Metadata related settings
33-
testutil.AssertEqualsString(t, "db connection", "sqlite:$CL_HOME/clace.db", c.Metadata.DBConnection)
33+
testutil.AssertEqualsString(t, "db connection", "sqlite:$CL_HOME/metadata/clace_metadata.db", c.Metadata.DBConnection)
3434
testutil.AssertEqualsBool(t, "auto upgrade", true, c.Metadata.AutoUpgrade)
3535

3636
// HTTPS listen related settings

0 commit comments

Comments
 (0)