status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(debug) don't overwrite the status-go log level

This commit is contained in:
Stefan 2023-08-16 16:54:23 +01:00 committed by Stefan Dunca
parent 988e7ac8d0
commit 3e8f710560
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app_service/service/accounts/service.nim
View File

@ -307,7 +307,7 @@ QtObject:
if(self.importedAccount.id == accountId): if(self.importedAccount.id == accountId):
return self.prepareAccountSettingsJsonObject(self.importedAccount, installationId, displayName) return self.prepareAccountSettingsJsonObject(self.importedAccount, installationId, displayName)
proc getDefaultNodeConfig*(self: Service, installationId: string, recoverAccount: bool): JsonNode = proc getDefaultNodeConfig*(self: Service, installationId: string, recoverAccount: bool, login: bool = false): JsonNode =
let fleet = Fleet.StatusProd let fleet = Fleet.StatusProd
let dnsDiscoveryURL = @["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"] let dnsDiscoveryURL = @["enrtree://AOGECG2SPND25EEFMAJ5WF3KSGJNSGV356DSTL2YVLLZWIV6SAYBM@prod.nodes.status.im"]
@ -344,6 +344,15 @@ QtObject:
# Waku V1 config # Waku V1 config
result["ListenAddr"] = newJString("0.0.0.0:" & wV1Port) result["ListenAddr"] = newJString("0.0.0.0:" & wV1Port)
# Don't override log level on login. For onboarding it is required, nothing to override
if login:
result.delete("LogLevel")
if existsEnv("LOG_LEVEL"):
let logLvl = getEnv("LOG_LEVEL")
if logLvl in @["ERROR", "WARN", "INFO", "DEBUG", "TRACE"]:
result["LogLevel"] = newJString($logLvl)
result["KeyStoreDir"] = newJString(self.keyStoreDir.replace(main_constants.STATUSGODIR, "")) result["KeyStoreDir"] = newJString(self.keyStoreDir.replace(main_constants.STATUSGODIR, ""))
result["RootDataDir"] = newJString(main_constants.STATUSGODIR) result["RootDataDir"] = newJString(main_constants.STATUSGODIR)
result["ProcessBackedupMessages"] = newJBool(recoverAccount) result["ProcessBackedupMessages"] = newJBool(recoverAccount)
@ -613,7 +622,7 @@ QtObject:
error "error: ", procName="verifyDatabasePassword", errName = e.name, errDesription = e.msg error "error: ", procName="verifyDatabasePassword", errName = e.name, errDesription = e.msg
proc doLogin(self: Service, account: AccountDto, hashedPassword, thumbnailImage, largeImage: string) = proc doLogin(self: Service, account: AccountDto, hashedPassword, thumbnailImage, largeImage: string) =
let nodeConfigJson = self.getDefaultNodeConfig(installationId = "", recoverAccount = false) let nodeConfigJson = self.getDefaultNodeConfig(installationId = "", recoverAccount = false, login = true)
let response = status_account.login( let response = status_account.login(
account.name, account.name,
account.keyUid, account.keyUid,
@ -695,7 +704,7 @@ QtObject:
"key-uid": accToBeLoggedIn.keyUid, "key-uid": accToBeLoggedIn.keyUid,
} }
let nodeConfigJson = self.getDefaultNodeConfig(installationId = "", recoverAccount = false) let nodeConfigJson = self.getDefaultNodeConfig(installationId = "", recoverAccount = false, login = true)
let response = status_account.loginWithKeycard(keycardData.whisperKey.privateKey, let response = status_account.loginWithKeycard(keycardData.whisperKey.privateKey,
keycardData.encryptionKey.publicKey, keycardData.encryptionKey.publicKey,