upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #3364 from nextcloud/sass-logging

Browse source 
Lower log levels of resource locator
This commit is contained in:
Robin Appelman 2017-02-06 12:52:57 +01:00 committed by GitHub
commit b55f5af7ea
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Template/CSSResourceLocator.php
View file

@ -91,11 +91,11 @@ class CSSResourceLocator extends ResourceLocator {
$this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false);
return true;
} else {
$this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
return false;
}
} else {
$this->logger->error('Scss is disabled for '.$root.'/'.$file.', ignoring', ['app' => 'core']);
$this->logger->debug('Scss is disabled for '.$root.'/'.$file.', ignoring', ['app' => 'core']);
return true;
}
}

4
lib/private/Template/ResourceLocator.php
View file

@ -75,7 +75,7 @@ abstract class ResourceLocator {
$this->doFind($resource);
} catch (ResourceNotFoundException $e) {
$resourceApp = substr($resource, 0, strpos($resource, '/'));
$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
}
}
if (!empty($this->theme)) {
@ -84,7 +84,7 @@ abstract class ResourceLocator {
$this->doFindTheme($resource);
} catch (ResourceNotFoundException $e) {
$resourceApp = substr($resource, 0, strpos($resource, '/'));
$this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
}
}
}

2
tests/lib/Template/ResourceLocatorTest.php
View file

@ -69,7 +69,7 @@ class ResourceLocatorTest extends \Test\TestCase {
->with('foo')
->will($this->throwException(new ResourceNotFoundException('foo', 'map')));
$this->logger->expects($this->exactly(2))
->method('error')
->method('debug')
->with($this->stringContains('map/foo'));
/** @var \OC\Template\ResourceLocator $locator */
$locator->find(array('foo'));