mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 06:06:40 +02:00
Code Issues Releases Wiki Activity

Add caching, group exec calls in one, refs #274

Browse Source
This commit is contained in:
Jordi Boggiano
2013-11-20 13:28:13 +01:00
parent a5a579bb62
commit aff8d92e29
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Monolog/Processor/GitProcessor.php
View File

@@ -11,42 +11,54 @@
namespace Monolog\Processor; namespace Monolog\Processor;
use Monolog\Logger;
/** /**
* Injects Git branch and Git commit SHA in all records * Injects Git branch and Git commit SHA in all records
* *
* @author Nick Otter * @author Nick Otter
* @author Jordi Boggiano <j.boggiano@seld.be>
*/ */
class GitProcessor class GitProcessor
{ {
private $level;
private static $cache;
public function __construct($level = Logger::DEBUG)
{
$this->level = $level;
}
/** /**
* @param array $record * @param array $record
* @return array * @return array
*/ */
public function __invoke(array $record) public function __invoke(array $record)
{ {
// return if the level is not high enough
if ($record['level'] < $this->level) {
return $record;
}
$branch = self::getBranch(); $record['extra']['git'] = self::getGitInfo();
$commit = self::getCommit();
$record['extra']['git']['branch'] = $branch;
$record['extra']['git']['commit'] = $commit;
return $record; return $record;
} }
static protected function getBranch() { private static function getGitInfo()
$branches = explode("\n", `git branch`); {
if (self::$cache) {
foreach ($branches as $branch) { return self::$cache;
if ($branch[0] == "*") {
return substr($branch, 2);
}
} }
return $branches;
}
static protected function getCommit() { $branches = `git branch -v --no-abbrev`;
$s = `git rev-parse HEAD`; if (preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) {
return trim($s); return self::$cache = array(
'branch' => $matches[1],
'commit' => $matches[2],
);
}
return self::$cache = array();
} }
} }

2
tests/Monolog/Processor/GitProcessorTest.php
View File

@@ -24,8 +24,6 @@ class GitProcessorTest extends TestCase
$record = $processor($this->getRecord()); $record = $processor($this->getRecord());
$this->assertArrayHasKey('git', $record['extra']); $this->assertArrayHasKey('git', $record['extra']);
$this->assertTrue(!is_array($record['extra']['git']['branch'])); $this->assertTrue(!is_array($record['extra']['git']['branch']));
} }
} }