Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/Service/AppAPIService.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ private function finalizeRequestToNC(ExApp $exApp, string $userId, IRequest $req
$this->userSession->setUser(null);
}
$this->session->set('app_api', true);
$this->session->set('app_api_system', true); // TODO: Remove after drop support NC29

if ($delay) {
$this->throttler->resetDelay($request->getRemoteAddress(), Application::APP_ID, [
Expand Down Expand Up @@ -448,7 +447,7 @@ public function runOccCommandInternal(array $args): bool {
}
$this->logger->info(sprintf('Calling occ(directory=%s): %s', $occDirectory ?? 'null', $args));
$process = proc_open('php console.php ' . $args, $descriptors, $pipes, $occDirectory);

if (!is_resource($process)) {
$this->logger->error(sprintf('Error calling occ(directory=%s): %s', $occDirectory ?? 'null', $args));
return false;
Expand All @@ -469,7 +468,7 @@ public function runOccCommandInternal(array $args): bool {
}

$this->logger->info(sprintf('OCC command executed successfully. stdout: %s, stderr: %s', $stdout, $stderr));

return true;
}

Expand Down