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

Code maintenance: storage merging reworked

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-29 17:49:38 +00:00
parent e643ce5b99
commit bedf613cff
6 changed files with 174 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/cli/cli.go
View File

@@ -70,7 +70,8 @@ func OpenvpnConfig(os os.OS) error {
if err != nil {
return err
}
allServers, err := storage.New(logger, os).SyncServers(constants.GetAllServers(), false)
allServers, err := storage.New(logger, os, constants.ServersData).
SyncServers(constants.GetAllServers())
if err != nil {
return err
}
@@ -121,9 +122,8 @@ func Update(args []string, os os.OS) error {
ctx := context.Background()
const clientTimeout = 10 * time.Second
httpClient := &http.Client{Timeout: clientTimeout}
storage := storage.New(logger, os)
const writeSync = false
currentServers, err := storage.SyncServers(constants.GetAllServers(), writeSync)
storage := storage.New(logger, os, constants.ServersData)
currentServers, err := storage.SyncServers(constants.GetAllServers())
if err != nil {
return fmt.Errorf("cannot update servers: %w", err)
}