Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: sing-box loglevel

Browse Source
This commit is contained in:
arm64v8a
2022-10-13 21:22:51 +08:00
parent a143bc8f45
commit 88012cb9d2
4 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
db/ConfigBuilder.cpp
View File

@@ -528,8 +528,7 @@ namespace NekoRay {
status->result = result;
// Log
result->coreConfig["log"] = QJsonObject{
{"level", dataStore->log_level.replace("warning", "warn").replace("none", "panic")}};
result->coreConfig["log"] = QJsonObject{{"level", dataStore->log_level}};
// Inbounds

17
ui/dialog_basic_settings.cpp
View File

@@ -55,6 +55,16 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
// Common
if (IS_NEKO_BOX) {
ui->groupBox_mux->hide();
ui->groupBox_http->hide();
ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed"));
ui->hlayout_l2->addWidget(ui->groupBox_log);
ui->log_level->addItems(QString("trace debug info warn error fatal panic").split(" "));
} else {
ui->log_level->addItems({"debug", "info", "warning", "none"});
}
ui->socks_ip->setText(NekoRay::dataStore->inbound_address);
ui->log_level->setCurrentText(NekoRay::dataStore->log_level);
CACHE.custom_inbound = NekoRay::dataStore->custom_inbound;
@@ -68,13 +78,6 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
C_EDIT_JSON_ALLOW_EMPTY(custom_inbound)
});
if (IS_NEKO_BOX) {
ui->groupBox_mux->hide();
ui->groupBox_http->hide();
ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed"));
ui->hlayout_l2->addWidget(ui->groupBox_log);
}
// Style
if (IS_NEKO_BOX) {
ui->connection_statistics_box->setDisabled(true);

23
ui/dialog_basic_settings.ui
View File

@@ -162,28 +162,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="log_level">
<item>
<property name="text">
<string notr="true">debug</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">info</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">warning</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">none</string>
</property>
</item>
</widget>
<widget class="QComboBox" name="log_level"/>
</item>
</layout>
</widget>

1
updater/updater.go
View File

@@ -50,7 +50,6 @@ func Updater() {
}
// remove old file
removeAll("./*.exe")
removeAll("./*.dll")
removeAll("./*.dmp")