Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 23:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1743: Terminate running bridge if has old version.

Browse Source
This commit is contained in:
Jakub
2022-07-22 13:18:38 +02:00
parent 1e2f4e9ebb
commit c4eb1a0f5b
4 changed files with 149 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/app/base/base.go
View File

@ -57,7 +57,6 @@ import (
"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
"github.com/allan-simon/go-singleinstance"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
@ -153,9 +152,9 @@ func New( //nolint:funlen
}
settingsObj := settings.New(settingsPath)
lock, err := singleinstance.CreateLockFile(locations.GetLockFile())
lock, err := checkSingleInstance(locations.GetLockFile(), settingsObj)
if err != nil {
logrus.Warnf("%v is already running", appName)
logrus.WithError(err).Warnf("%v is already running", appName)
return nil, api.CheckOtherInstanceAndFocus(settingsObj.GetInt(settings.APIPortKey))
}