Browse Source

node_config: load() returns true on parse success; main: specific diagnostics per missing field

chatgui
Evgeny 3 months ago
parent
commit
102816d0dc
  1. 11
      tools/chatgui/src/main.cpp
  2. 2
      tools/chatgui/transport/node_config.cpp

11
tools/chatgui/src/main.cpp

@ -42,11 +42,16 @@ int main(int argc, char *argv[]) {
}
} else {
if (!cfg.load()) {
qCritical("Failed to load config: %s", qPrintable(cfgPath));
qCritical("Cannot open/read config file: %s", qPrintable(cfgPath));
return 1;
}
if (cfg.privKey().length() != 64 || cfg.pubKey().length() != 64 ||
cfg.nodeId().length() != 16) {
if (cfg.privKey().length() != 64 || cfg.pubKey().length() != 64) {
qWarning("Config: keys missing/invalid, regenerating identity");
cfg.generateIdentity();
needSave = true;
}
if (cfg.nodeId().length() != 16) {
qWarning("Config: my_node_id missing/invalid, regenerating identity");
cfg.generateIdentity();
needSave = true;
}

2
tools/chatgui/transport/node_config.cpp

@ -134,7 +134,7 @@ bool NodeConfig::load() {
if (!controlIp.isEmpty() && !controlPort.isEmpty())
m_controlAddr = controlIp + ":" + controlPort;
return !m_nodeId.isEmpty();
return true;
}
bool NodeConfig::save() {

Loading…
Cancel
Save