Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-27 03:41:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve exit

Browse Source
This commit is contained in:
Nova 2025-07-24 18:24:46 +03:30
parent ca6924c467
commit 72c7d6c9ea
5 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/server/gen/libcore.proto
View File

@ -5,8 +5,6 @@ option go_package = "grpc_server/gen";
option optimize_for = LITE_RUNTIME; option optimize_for = LITE_RUNTIME;
service LibcoreService { service LibcoreService {
rpc Exit(EmptyReq) returns (EmptyResp);
//
rpc Start(LoadConfigReq) returns (ErrorResp); rpc Start(LoadConfigReq) returns (ErrorResp);
rpc Stop(EmptyReq) returns (ErrorResp); rpc Stop(EmptyReq) returns (ErrorResp);
rpc CheckConfig(LoadConfigReq) returns (ErrorResp); rpc CheckConfig(LoadConfigReq) returns (ErrorResp);

16
core/server/server.go
View File

@ -40,22 +40,6 @@ func To[T any](v T) *T {
return &v return &v
} }
func (s *server) Exit(ctx context.Context, in *gen.EmptyReq) (out *gen.EmptyResp, _ error) {
out = &gen.EmptyResp{}
if needUnsetDNS {
needUnsetDNS = false
err := sys.SetSystemDNS("Empty", boxInstance.Network().InterfaceMonitor())
if err != nil {
log.Println("Failed to unset system DNS:", err)
}
}
// Connection closed
defer os.Exit(0)
return
}
func (s *server) Start(ctx context.Context, in *gen.LoadConfigReq) (out *gen.ErrorResp, _ error) { func (s *server) Start(ctx context.Context, in *gen.LoadConfigReq) (out *gen.ErrorResp, _ error) {
var err error var err error

2
include/api/gRPC.h
View File

@ -16,8 +16,6 @@ namespace API {
public: public:
explicit Client(std::function<void(const QString &)> onError, const QString &target); explicit Client(std::function<void(const QString &)> onError, const QString &target);
void Exit();
// QString returns is error string // QString returns is error string
QString Start(bool *rpcOK, const libcore::LoadConfigReq &request); QString Start(bool *rpcOK, const libcore::LoadConfigReq &request);

7
src/api/gRPC.cpp
View File

@ -188,13 +188,6 @@ namespace API {
*rpcOK = false; \ *rpcOK = false; \
onError(QString("QNetworkReply::NetworkError code: %1\n").arg(status)); onError(QString("QNetworkReply::NetworkError code: %1\n").arg(status));
void Client::Exit() {
libcore::EmptyReq request;
libcore::EmptyResp reply;
std::vector<uint8_t> rsp;
default_grpc_channel->Call("Exit", spb::pb::serialize< std::string >( request ), rsp, 100);
}
QString Client::Start(bool *rpcOK, const libcore::LoadConfigReq &request) { QString Client::Start(bool *rpcOK, const libcore::LoadConfigReq &request) {
libcore::ErrorResp reply; libcore::ErrorResp reply;
std::vector<uint8_t> rsp; std::vector<uint8_t> rsp;

2
src/ui/mainwindow.cpp
View File

@ -843,7 +843,7 @@ void MainWindow::prepare_exit()
Configs::dataStore->save_control_no_save = true; // don't change datastore after this line Configs::dataStore->save_control_no_save = true; // don't change datastore after this line
profile_stop(false, true); profile_stop(false, true);
sem_stopped.acquire(); sem_stopped.acquire();
API::defaultClient->Exit(); core_process->Kill();
mu_exit.unlock(); mu_exit.unlock();
qDebug() << "prepare exit done!"; qDebug() << "prepare exit done!";
} }