StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Prefer regular logging to raw_logging

Browse Source 
PiperOrigin-RevId: 558089528
Change-Id: Id3fb3ec16d25c5df859c305e1b0db00b54212958
This commit is contained in:
Wiktor Garbacz 2023-08-18 02:42:41 -07:00 committed by Copybara-Service
parent b258535161
commit ff23e878d3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandboxed_api/sandbox2/forkingclient.cc
View File

@ -42,7 +42,7 @@ pid_t ForkingClient::WaitAndFork() {
}
pid_t pid = fork_server_worker_->ServeRequest();
if (pid == -1 && fork_server_worker_->IsTerminated()) {
SAPI_RAW_VLOG(1, "ForkServer Comms closed. Exiting");
VLOG(1) << "ForkServer Comms closed. Exiting";
exit(0);
}
return pid;

14
sandboxed_api/sandbox2/monitor_unotify.cc
View File

@ -231,15 +231,11 @@ void UnotifyMonitor::SetExitStatusFromStatusPipe() {
int code, status;
rusage usage;
SAPI_RAW_PCHECK(
read(process_.status_fd.get(), &code, sizeof(code)) == sizeof(code),
"read");
SAPI_RAW_PCHECK(
read(process_.status_fd.get(), &status, sizeof(status)) == sizeof(status),
"read");
SAPI_RAW_PCHECK(
read(process_.status_fd.get(), &usage, sizeof(usage)) == sizeof(usage),
"read");
PCHECK(read(process_.status_fd.get(), &code, sizeof(code)) == sizeof(code));
PCHECK(read(process_.status_fd.get(), &status, sizeof(status)) ==
sizeof(status));
PCHECK(read(process_.status_fd.get(), &usage, sizeof(usage)) ==
sizeof(usage));
result_.SetRUsageSandboxee(usage);
if (code == CLD_EXITED) {