Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>tags/v29.0.0beta1
@@ -850,11 +850,11 @@ class ShareAPIController extends OCSController { | |||
try { | |||
$share = $this->shareManager->createShare($share); | |||
} catch (GenericShareException $e) { | |||
\OC::$server->getLogger()->logException($e); | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); | |||
$code = $e->getCode() === 0 ? 403 : $e->getCode(); | |||
throw new OCSException($e->getHint(), $code); | |||
} catch (\Exception $e) { | |||
\OC::$server->getLogger()->logException($e); | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); | |||
throw new OCSForbiddenException($e->getMessage(), $e); | |||
} | |||
@@ -26,6 +26,9 @@ namespace OCA\Files_Sharing; | |||
use OCP\AppFramework\Utility\ITimeFactory; | |||
use OCP\BackgroundJob\TimedJob; | |||
use OCP\IDBConnection; | |||
use OCP\Server; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Delete all share entries that have no matching entries in the file cache table. | |||
@@ -33,10 +36,8 @@ use OCP\BackgroundJob\TimedJob; | |||
class DeleteOrphanedSharesJob extends TimedJob { | |||
/** | |||
* Default interval in minutes | |||
* | |||
* @var int $defaultIntervalMin | |||
**/ | |||
protected $defaultIntervalMin = 15; | |||
protected int $defaultIntervalMin = 15; | |||
/** | |||
* sets the correct interval for this timed job | |||
@@ -53,15 +54,15 @@ class DeleteOrphanedSharesJob extends TimedJob { | |||
* @param array $argument unused argument | |||
*/ | |||
public function run($argument) { | |||
$connection = \OC::$server->getDatabaseConnection(); | |||
$logger = \OC::$server->getLogger(); | |||
$connection = Server::get(IDBConnection::class); | |||
$logger = Server::get(LoggerInterface::class); | |||
$sql = | |||
'DELETE FROM `*PREFIX*share` ' . | |||
'WHERE `item_type` in (\'file\', \'folder\') ' . | |||
'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; | |||
$deletedEntries = $connection->executeUpdate($sql); | |||
$deletedEntries = $connection->executeStatement($sql); | |||
$logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']); | |||
} | |||
} |
@@ -35,6 +35,7 @@ namespace OCA\Files_Sharing\ShareBackend; | |||
use OCA\FederatedFileSharing\FederatedShareProvider; | |||
use OCP\Share\IShare; | |||
use Psr\Log\LoggerInterface; | |||
class File implements \OCP\Share_Backend_File_Dependent { | |||
public const FORMAT_SHARED_STORAGE = 0; | |||
@@ -233,7 +234,7 @@ class File implements \OCP\Share_Backend_File_Dependent { | |||
if (isset($fileOwner)) { | |||
$source['fileOwner'] = $fileOwner; | |||
} else { | |||
\OC::$server->getLogger()->error('No owner found for reshare', ['app' => 'files_sharing']); | |||
\OCP\Server::get(LoggerInterface::class)->error('No owner found for reshare', ['app' => 'files_sharing']); | |||
} | |||
return $source; |
@@ -40,6 +40,7 @@ use OCP\Files\Storage\IStorageFactory; | |||
use OCP\ICache; | |||
use OCP\IUser; | |||
use OCP\Share\Events\VerifyMountPointEvent; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Shared mount points can be moved by the user | |||
@@ -198,7 +199,7 @@ class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint | |||
// it is not a file relative to data/user/files | |||
if (count($split) < 3 || $split[1] !== 'files') { | |||
\OC::$server->getLogger()->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']); | |||
\OCP\Server::get(LoggerInterface::class)->error('Can not strip userid and "files/" from path: ' . $path, ['app' => 'files_sharing']); | |||
throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10); | |||
} | |||
@@ -226,7 +227,13 @@ class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint | |||
$this->setMountPoint($target); | |||
$this->storage->setMountPoint($relTargetPath); | |||
} catch (\Exception $e) { | |||
\OC::$server->getLogger()->logException($e, ['app' => 'files_sharing', 'message' => 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"']); | |||
\OCP\Server::get(LoggerInterface::class)->error( | |||
'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"', | |||
[ | |||
'app' => 'files_sharing', | |||
'exception' => $e, | |||
] | |||
); | |||
} | |||
return $result; |
@@ -35,6 +35,8 @@ | |||
*/ | |||
namespace OCA\User_LDAP; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* @property int ldapPagingSize holds an integer | |||
* @property string ldapUserAvatarRule | |||
@@ -598,7 +600,7 @@ class Configuration { | |||
return [strtolower($attribute)]; | |||
} | |||
if ($value !== self::AVATAR_PREFIX_DEFAULT) { | |||
\OC::$server->getLogger()->warning('Invalid config value to ldapUserAvatarRule; falling back to default.'); | |||
\OCP\Server::get(LoggerInterface::class)->warning('Invalid config value to ldapUserAvatarRule; falling back to default.'); | |||
} | |||
return $defaultAttributes; | |||
} |
@@ -24,6 +24,7 @@ | |||
namespace OCA\User_LDAP; | |||
use OCP\GroupInterface; | |||
use Psr\Log\LoggerInterface; | |||
class GroupPluginManager { | |||
private int $respondToActions = 0; | |||
@@ -58,7 +59,7 @@ class GroupPluginManager { | |||
foreach ($this->which as $action => $v) { | |||
if ((bool)($respondToActions & $action)) { | |||
$this->which[$action] = $plugin; | |||
\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
\OCP\Server::get(LoggerInterface::class)->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
} | |||
} | |||
} |
@@ -30,6 +30,7 @@ use Doctrine\DBAL\Exception; | |||
use Doctrine\DBAL\Platforms\SqlitePlatform; | |||
use OCP\DB\IPreparedStatement; | |||
use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Class AbstractMapping | |||
@@ -351,7 +352,7 @@ abstract class AbstractMapping { | |||
*/ | |||
public function map($fdn, $name, $uuid) { | |||
if (mb_strlen($fdn) > 4000) { | |||
\OC::$server->getLogger()->error( | |||
\OCP\Server::get(LoggerInterface::class)->error( | |||
'Cannot map, because the DN exceeds 4000 characters: {dn}', | |||
[ | |||
'app' => 'user_ldap', |
@@ -26,6 +26,7 @@ | |||
namespace OCA\User_LDAP; | |||
use OC\User\Backend; | |||
use Psr\Log\LoggerInterface; | |||
class UserPluginManager { | |||
private int $respondToActions = 0; | |||
@@ -62,12 +63,12 @@ class UserPluginManager { | |||
foreach ($this->which as $action => $v) { | |||
if (is_int($action) && (bool)($respondToActions & $action)) { | |||
$this->which[$action] = $plugin; | |||
\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
\OCP\Server::get(LoggerInterface::class)->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
} | |||
} | |||
if (method_exists($plugin, 'deleteUser')) { | |||
$this->which['deleteUser'] = $plugin; | |||
\OC::$server->getLogger()->debug("Registered action deleteUser to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
\OCP\Server::get(LoggerInterface::class)->debug("Registered action deleteUser to plugin ".get_class($plugin), ['app' => 'user_ldap']); | |||
} | |||
} | |||
@@ -143,7 +143,7 @@ abstract class AbstractIntegrationTest { | |||
* initializes the Access test instance | |||
*/ | |||
protected function initAccess() { | |||
$this->access = new Access($this->connection, $this->ldap, $this->userManager, $this->helper, \OC::$server->getConfig(), \OC::$server->getLogger()); | |||
$this->access = new Access($this->connection, $this->ldap, $this->userManager, $this->helper, \OC::$server->getConfig(), \OCP\Server::get(LoggerInterface::class)); | |||
} | |||
/** |
@@ -60,7 +60,7 @@ class File implements ICache { | |||
$this->storage = new View('/' . $user->getUID() . '/cache'); | |||
return $this->storage; | |||
} else { | |||
\OC::$server->get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']); | |||
\OCP\Server::get(LoggerInterface::class)->error('Can\'t get cache storage, user not logged in', ['app' => 'core']); | |||
throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in'); | |||
} | |||
} | |||
@@ -192,11 +192,11 @@ class File implements ICache { | |||
} | |||
} catch (\OCP\Lock\LockedException $e) { | |||
// ignore locked chunks | |||
\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']); | |||
\OCP\Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']); | |||
} catch (\OCP\Files\ForbiddenException $e) { | |||
\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']); | |||
\OCP\Server::get(LoggerInterface::class)->debug('Could not cleanup forbidden chunk "' . $file . '"', ['app' => 'core']); | |||
} catch (\OCP\Files\LockNotAcquiredException $e) { | |||
\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']); | |||
\OCP\Server::get(LoggerInterface::class)->debug('Could not cleanup locked chunk "' . $file . '"', ['app' => 'core']); | |||
} | |||
} | |||
} |
@@ -48,6 +48,7 @@ use OCP\Files\Storage\IStorageFactory; | |||
use OCP\IUser; | |||
use OCP\IUserManager; | |||
use OCP\IUserSession; | |||
use Psr\Log\LoggerInterface; | |||
class Filesystem { | |||
private static ?Mount\Manager $mounts = null; | |||
@@ -200,7 +201,7 @@ class Filesystem { | |||
*/ | |||
public static function addStorageWrapper($wrapperName, $wrapper, $priority = 50) { | |||
if (self::$logWarningWhenAddingStorageWrapper) { | |||
\OC::$server->getLogger()->warning("Storage wrapper '{wrapper}' was not registered via the 'OC_Filesystem - preSetup' hook which could cause potential problems.", [ | |||
\OCP\Server::get(LoggerInterface::class)->warning("Storage wrapper '{wrapper}' was not registered via the 'OC_Filesystem - preSetup' hook which could cause potential problems.", [ | |||
'wrapper' => $wrapperName, | |||
'app' => 'filesystem', | |||
]); |
@@ -47,7 +47,7 @@ use OCP\Files\ObjectStore\IObjectStore; | |||
use OCP\Files\ObjectStore\IObjectStoreMultiPartUpload; | |||
use OCP\Files\Storage\IChunkedFileWrite; | |||
use OCP\Files\Storage\IStorage; | |||
use OCP\ILogger; | |||
use Psr\Log\LoggerInterface; | |||
class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFileWrite { | |||
use CopyDirectory; | |||
@@ -56,7 +56,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
protected string $id; | |||
private string $objectPrefix = 'urn:oid:'; | |||
private ILogger $logger; | |||
private LoggerInterface $logger; | |||
private bool $handleCopiesAsOwned; | |||
protected bool $validateWrites = true; | |||
@@ -84,7 +84,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
} | |||
$this->handleCopiesAsOwned = (bool)($params['handleCopiesAsOwned'] ?? false); | |||
$this->logger = \OC::$server->getLogger(); | |||
$this->logger = \OCP\Server::get(LoggerInterface::class); | |||
} | |||
public function mkdir($path, bool $force = false) { | |||
@@ -220,10 +220,13 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
$this->objectStore->deleteObject($this->getURN($entry->getId())); | |||
} catch (\Exception $ex) { | |||
if ($ex->getCode() !== 404) { | |||
$this->logger->logException($ex, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not delete object ' . $this->getURN($entry->getId()) . ' for ' . $entry->getPath(), | |||
]); | |||
$this->logger->error( | |||
'Could not delete object ' . $this->getURN($entry->getId()) . ' for ' . $entry->getPath(), | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $ex, | |||
] | |||
); | |||
return false; | |||
} | |||
//removing from cache is ok as it does not exist in the objectstore anyway | |||
@@ -286,7 +289,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
return IteratorDirectory::wrap($files); | |||
} catch (\Exception $e) { | |||
$this->logger->logException($e); | |||
$this->logger->error($e->getMessage(), ['exception' => $e]); | |||
return false; | |||
} | |||
} | |||
@@ -336,16 +339,22 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
} | |||
return $handle; | |||
} catch (NotFoundException $e) { | |||
$this->logger->logException($e, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path, | |||
]); | |||
$this->logger->error( | |||
'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $e, | |||
] | |||
); | |||
throw $e; | |||
} catch (\Exception $ex) { | |||
$this->logger->logException($ex, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path, | |||
]); | |||
} catch (\Exception $e) { | |||
$this->logger->error( | |||
'Could not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $e, | |||
] | |||
); | |||
return false; | |||
} | |||
} else { | |||
@@ -442,10 +451,13 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
]; | |||
$this->getCache()->put($path, $stat); | |||
} catch (\Exception $ex) { | |||
$this->logger->logException($ex, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not create object for ' . $path, | |||
]); | |||
$this->logger->error( | |||
'Could not create object for ' . $path, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $ex, | |||
] | |||
); | |||
throw $ex; | |||
} | |||
} | |||
@@ -540,15 +552,21 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
* Else people lose access to existing files | |||
*/ | |||
$this->getCache()->remove($uploadPath); | |||
$this->logger->logException($ex, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not create object ' . $urn . ' for ' . $path, | |||
]); | |||
$this->logger->error( | |||
'Could not create object ' . $urn . ' for ' . $path, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $ex, | |||
] | |||
); | |||
} else { | |||
$this->logger->logException($ex, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not update object ' . $urn . ' for ' . $path, | |||
]); | |||
$this->logger->error( | |||
'Could not update object ' . $urn . ' for ' . $path, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $ex, | |||
] | |||
); | |||
} | |||
throw $ex; // make this bubble up | |||
} | |||
@@ -713,10 +731,13 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil | |||
} | |||
} catch (S3MultipartUploadException|S3Exception $e) { | |||
$this->objectStore->abortMultipartUpload($urn, $writeToken); | |||
$this->logger->logException($e, [ | |||
'app' => 'objectstore', | |||
'message' => 'Could not compete multipart upload ' . $urn . ' with uploadId ' . $writeToken, | |||
]); | |||
$this->logger->error( | |||
'Could not compete multipart upload ' . $urn . ' with uploadId ' . $writeToken, | |||
[ | |||
'app' => 'objectstore', | |||
'exception' => $e, | |||
] | |||
); | |||
throw new GenericFileException('Could not write chunked file'); | |||
} | |||
return $size; |
@@ -30,6 +30,7 @@ namespace OC\L10N; | |||
use OCP\IL10N; | |||
use OCP\L10N\IFactory; | |||
use Psr\Log\LoggerInterface; | |||
use Punic\Calendar; | |||
use Symfony\Component\Translation\IdentityTranslator; | |||
@@ -234,7 +235,7 @@ class L10N implements IL10N { | |||
$json = json_decode(file_get_contents($translationFile), true); | |||
if (!\is_array($json)) { | |||
$jsonError = json_last_error(); | |||
\OC::$server->getLogger()->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']); | |||
\OCP\Server::get(LoggerInterface::class)->warning("Failed to load $translationFile - json error code: $jsonError", ['app' => 'l10n']); | |||
return false; | |||
} | |||
@@ -24,7 +24,9 @@ | |||
*/ | |||
namespace OC\Log; | |||
use OCP\IConfig; | |||
use OCP\Log\RotationTrait; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* This rotates the current logfile to a new name, this way the total log usage | |||
@@ -35,15 +37,15 @@ use OCP\Log\RotationTrait; | |||
class Rotate extends \OCP\BackgroundJob\Job { | |||
use RotationTrait; | |||
public function run($dummy): void { | |||
$systemConfig = \OC::$server->getSystemConfig(); | |||
$this->filePath = $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log'); | |||
public function run($argument): void { | |||
$config = \OCP\Server::get(IConfig::class); | |||
$this->filePath = $config->getSystemValueString('logfile', $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data') . '/nextcloud.log'); | |||
$this->maxSize = \OC::$server->getConfig()->getSystemValueInt('log_rotate_size', 100 * 1024 * 1024); | |||
$this->maxSize = $config->getSystemValueInt('log_rotate_size', 100 * 1024 * 1024); | |||
if ($this->shouldRotateBySize()) { | |||
$rotatedFile = $this->rotate(); | |||
$msg = 'Log file "'.$this->filePath.'" was over '.$this->maxSize.' bytes, moved to "'.$rotatedFile.'"'; | |||
\OC::$server->getLogger()->info($msg, ['app' => Rotate::class]); | |||
\OCP\Server::get(LoggerInterface::class)->info($msg, ['app' => Rotate::class]); | |||
} | |||
} | |||
} |
@@ -30,6 +30,7 @@ namespace OC; | |||
use OCP\ISearch; | |||
use OCP\Search\PagedProvider; | |||
use OCP\Search\Provider; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Provide an interface to all search providers | |||
@@ -65,7 +66,7 @@ class Search implements ISearch { | |||
$results = array_merge($results, $providerResults); | |||
} | |||
} else { | |||
\OC::$server->getLogger()->warning('Ignoring Unknown search provider', ['provider' => $provider]); | |||
\OCP\Server::get(LoggerInterface::class)->warning('Ignoring Unknown search provider', ['provider' => $provider]); | |||
} | |||
} | |||
return $results; |
@@ -55,6 +55,7 @@ use OCP\Share\Exceptions\ShareNotFound; | |||
use OCP\Share\IAttributes; | |||
use OCP\Share\IShare; | |||
use OCP\Share\IShareProvider; | |||
use Psr\Log\LoggerInterface; | |||
use function str_starts_with; | |||
/** | |||
@@ -1237,7 +1238,8 @@ class DefaultShareProvider implements IShareProvider { | |||
) | |||
); | |||
} else { | |||
\OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType)); | |||
$e = new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType); | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); | |||
return; | |||
} | |||
@@ -35,7 +35,6 @@ use OC\Tagging\TagMapper; | |||
use OCP\DB\Exception; | |||
use OCP\DB\QueryBuilder\IQueryBuilder; | |||
use OCP\IDBConnection; | |||
use OCP\ILogger; | |||
use OCP\ITags; | |||
use OCP\Share_Backend; | |||
use Psr\Log\LoggerInterface; | |||
@@ -486,11 +485,13 @@ class Tags implements ITags { | |||
try { | |||
return $this->getIdsForTag(ITags::TAG_FAVORITE); | |||
} catch (\Exception $e) { | |||
\OC::$server->getLogger()->logException($e, [ | |||
'message' => __METHOD__, | |||
'level' => ILogger::ERROR, | |||
'app' => 'core', | |||
]); | |||
\OCP\Server::get(LoggerInterface::class)->error( | |||
$e->getMessage(), | |||
[ | |||
'app' => 'core', | |||
'exception' => $e, | |||
] | |||
); | |||
return []; | |||
} | |||
} | |||
@@ -549,7 +550,7 @@ class Tags implements ITags { | |||
try { | |||
$qb->executeStatement(); | |||
} catch (\Exception $e) { | |||
\OC::$server->getLogger()->error($e->getMessage(), [ | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), [ | |||
'app' => 'core', | |||
'exception' => $e, | |||
]); |
@@ -56,6 +56,7 @@ use OCP\User\Backend\ISearchKnownUsersBackend; | |||
use OCP\User\Events\BeforeUserCreatedEvent; | |||
use OCP\User\Events\UserCreatedEvent; | |||
use OCP\UserInterface; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Class Manager | |||
@@ -235,7 +236,7 @@ class Manager extends PublicEmitter implements IUserManager { | |||
$result = $this->checkPasswordNoLogging($loginName, $password); | |||
if ($result === false) { | |||
\OC::$server->getLogger()->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']); | |||
\OCP\Server::get(LoggerInterface::class)->warning('Login failed: \''. $loginName .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). '\')', ['app' => 'core']); | |||
} | |||
return $result; |
@@ -38,6 +38,7 @@ use OC\AppFramework\Routing\RouteConfig; | |||
use OC\Route\Router; | |||
use OC\ServerContainer; | |||
use OCP\Route\IRouter; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* Class App | |||
@@ -98,8 +99,9 @@ class App { | |||
} | |||
if (!$setUpViaQuery && $applicationClassName !== \OCP\AppFramework\App::class) { | |||
\OC::$server->getLogger()->logException($e, [ | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), [ | |||
'app' => $appName, | |||
'exception' => $e, | |||
]); | |||
} | |||
} |
@@ -42,6 +42,7 @@ if (\OCP\Util::needUpgrade() | |||
} | |||
use OCP\Security\Bruteforce\MaxDelayReached; | |||
use Psr\Log\LoggerInterface; | |||
use Symfony\Component\Routing\Exception\MethodNotAllowedException; | |||
use Symfony\Component\Routing\Exception\ResourceNotFoundException; | |||
@@ -81,7 +82,7 @@ try { | |||
} catch (\OC\User\LoginException $e) { | |||
OC_API::respond(new \OC\OCS\Result(null, \OCP\AppFramework\OCSController::RESPOND_UNAUTHORISED, 'Unauthorised')); | |||
} catch (\Exception $e) { | |||
\OC::$server->getLogger()->logException($e); | |||
\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]); | |||
OC_API::setContentType(); | |||
$format = \OC::$server->getRequest()->getParam('format', 'xml'); |
@@ -32,6 +32,8 @@ | |||
*/ | |||
require_once __DIR__ . '/lib/versioncheck.php'; | |||
use Psr\Log\LoggerInterface; | |||
/** | |||
* @param $service | |||
* @return string | |||
@@ -103,10 +105,10 @@ try { | |||
$status = 503; | |||
} | |||
//show the user a detailed error page | |||
\OC::$server->getLogger()->logException($ex, ['app' => 'public']); | |||
\OCP\Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]); | |||
OC_Template::printExceptionErrorPage($ex, $status); | |||
} catch (Error $ex) { | |||
//show the user a detailed error page | |||
\OC::$server->getLogger()->logException($ex, ['app' => 'public']); | |||
\OCP\Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'public', 'exception' => $ex]); | |||
OC_Template::printExceptionErrorPage($ex, 500); | |||
} |
@@ -33,6 +33,8 @@ | |||
*/ | |||
require_once __DIR__ . '/lib/versioncheck.php'; | |||
use Psr\Log\LoggerInterface; | |||
try { | |||
require_once __DIR__ . '/lib/base.php'; | |||
@@ -62,5 +64,5 @@ try { | |||
} | |||
} catch (Exception $ex) { | |||
http_response_code(500); | |||
\OC::$server->getLogger()->logException($ex, ['app' => 'remote']); | |||
\OCP\Server::get(LoggerInterface::class)->error($ex->getMessage(), ['app' => 'remote','exception' => $ex]); | |||
} |