cwtch.im
/
libcwtch-go
Archived
3
0
Fork 1
Code Issues 2 Pull Requests Releases 26 Wiki Activity

Merge pull request 'make server functionality create servers dir on init' (#44) from macosBuild into trunk
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #44
This commit is contained in:
Sarah Jamie Lewis 2021-11-05 20:33:52 +00:00
parent 81705ce48f e966392233
commit 86c5a51b22
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
features/servers/servers_functionality.go
View File

@ -6,7 +6,9 @@ import (
"git.openprivacy.ca/cwtch.im/libcwtch-go/constants"
"git.openprivacy.ca/cwtch.im/server"
"git.openprivacy.ca/openprivacy/connectivity"
"path"
"git.openprivacy.ca/openprivacy/log"
"os"
"path/filepath"
"sync"
)
@ -44,7 +46,12 @@ func InitServers(acn connectivity.ACN, appdir string) {
lock.Lock()
defer lock.Unlock()
if appServers == nil {
appServers = server.NewServers(acn, path.Join(appdir, "servers"))
serversDir := filepath.Join(appdir, "servers")
err := os.MkdirAll(serversDir, 0700)
if err != nil {
log.Errorf("Could not init servers directory: %s", err)
}
appServers = server.NewServers(acn, serversDir)
appServers.LoadServers(constants.DefactoPasswordForUnencryptedProfiles)
}
}
@ -131,4 +138,4 @@ func (si *ServerInfo) EnrichEvent(e *event.Event) {
} else {
e.Data["Running"] = "false"
}
}
}

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.15
require (
cwtch.im/cwtch v0.13.2
git.openprivacy.ca/cwtch.im/server v1.3.2
git.openprivacy.ca/cwtch.im/server v1.3.3
git.openprivacy.ca/openprivacy/connectivity v1.5.0
git.openprivacy.ca/openprivacy/log v1.0.3
golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect

2
go.sum
View File

@ -12,6 +12,8 @@ git.openprivacy.ca/cwtch.im/server v1.3.1 h1:Kt4TnlGxGPk1KTjvs1cXtnFWDx+hYqu8w+2
git.openprivacy.ca/cwtch.im/server v1.3.1/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw=
git.openprivacy.ca/cwtch.im/server v1.3.2 h1:dUNMM88IWER6cmgCfhekahkef7laH597hqTp9CE2tYg=
git.openprivacy.ca/cwtch.im/server v1.3.2/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw=
git.openprivacy.ca/cwtch.im/server v1.3.3 h1:LhHXlFAKzl2zM6Jd2Z3w3qMZM3UnRUA0qXWrlRBvKv8=
git.openprivacy.ca/cwtch.im/server v1.3.3/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw=
git.openprivacy.ca/cwtch.im/tapir v0.4.9 h1:LXonlztwvI1F1++0IyomIcDH1/Bxzo+oN8YjGonNvjM=
git.openprivacy.ca/cwtch.im/tapir v0.4.9/go.mod h1:p4bHo3DAO8wwimU6JAeZXbfPQ4jnoA2bV+4YvknWTNQ=
git.openprivacy.ca/openprivacy/bine v0.0.4 h1:CO7EkGyz+jegZ4ap8g5NWRuDHA/56KKvGySR6OBPW+c=