Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added logging of executed setup files #43

Closed
wants to merge 5 commits into from
Closed

Added logging of executed setup files #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa5be36
Added logging of executed setup files
Jul 16, 2012
e0a4fd5
Added support for logging to php://output
Jul 18, 2012
2f47393
Merge remote branch 'upstream/master'
Jul 18, 2012
03226e6
Implemented toplogical sorting for totals
Aug 15, 2012
6e45d94
Merge branch 'master' of github.com:amenk/magento2
Aug 15, 2012
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
26 changes: 15 additions & 11 deletions app/Mage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,17 +768,21 @@ public static function log($message, $level = null, $file = '', $forceLog = fals

try {
if (!isset($loggers[$file])) {
$logDir = self::getBaseDir('var') . DS . 'log';
$logFile = $logDir . DS . $file;

if (!is_dir($logDir)) {
mkdir($logDir);
chmod($logDir, 0777);
}

if (!file_exists($logFile)) {
file_put_contents($logFile, '');
chmod($logFile, 0777);
if (substr($file,0,6) == 'php://') {
$logFile = $file;
} else {
$logDir = self::getBaseDir('var') . DS . 'log';
$logFile = $logDir . DS . $file;

if (!is_dir($logDir)) {
mkdir($logDir);
chmod($logDir, 0777);
}

if (!file_exists($logFile)) {
file_put_contents($logFile, '');
chmod($logFile, 0777);
}
}

$format = '%timestamp% %priorityName% (%priority%): %message%' . PHP_EOL;
Expand Down
3 changes: 3 additions & 0 deletions app/code/core/Mage/Core/Model/Resource/Setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,9 @@ protected function _modifyResourceDb($actionType, $fromVersion, $toVersion)

if ($result) {
$this->_setResourceVersion($actionType, $file['toVersion']);
Mage::log(sprintf('Update script execution: Success - File: %s', $fileName), Zend_Log::NOTICE);
} else {
Mage::log(sprintf('Update script execution: Failure - File: %s', $fileName), Zend_Log::NOTICE);
}
} catch (Exception $e) {
printf('<pre>%s</pre>', print_r($e, true));
Expand Down
98 changes: 54 additions & 44 deletions app/code/core/Mage/Sales/Model/Config/Ordered.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,43 @@ protected function _prepareConfigArray($code, $totalConfig)
return $totalConfig;
}


/**
* Topological sort
*
* @param $nodeids Node Ids - example: array('subtotal','grand_total');
* @param $edges Array of Edges. Each edge is specified as an array with two elements: The source and destination node of the edge
* Example: array(array('subtotal','grand_total')); -> subtotal comes before grand_total
* @return array|null
*/
public function _topologicalSort($nodeids, $edges) {
$L = $S = $nodes = array();
foreach($nodeids as $id) {
$nodes[$id] = array('in'=>array(), 'out'=>array());
foreach($edges as $e) {
if ($id==$e[0]) { $nodes[$id]['out'][]=$e[1]; }
if ($id==$e[1]) { $nodes[$id]['in'][]=$e[0]; }
}
}
foreach ($nodes as $id=>$n) { if (empty($n['in'])) $S[]=$id; }
while ($id = array_shift($S)) {
if (!in_array($id, $L)) {
$L[] = $id;
foreach($nodes[$id]['out'] as $m) {
$nodes[$m]['in'] = array_diff($nodes[$m]['in'], array($id));
if (empty($nodes[$m]['in'])) { $S[] = $m; }
}
$nodes[$id]['out'] = array();
}
}
foreach($nodes as $n) {
if (!empty($n['in']) or !empty($n['out'])) {
return null; // not sortable as graph is cyclic
}
}
return $L;
}

/**
* Aggregate before/after information from all items and sort totals based on this data
*
Expand All @@ -140,36 +177,30 @@ protected function _getSortedCollectorCodes()
$element = current($configArray);
if (isset($element['sort_order'])) {
uasort($configArray, array($this, '_compareSortOrder'));
$sortedCollectors = array_keys($configArray);
} else {
foreach ($configArray as $code => $data) {
// prepare data for topological sort
$nodes = array_keys($configArray);
$edges = array();

foreach ($configArray as $data) {
$_code = $data['_code'];
if (!isset($configArray[$_code])) continue;
foreach ($data['before'] as $beforeCode) {
if (!isset($configArray[$beforeCode])) {
continue;
}
$configArray[$code]['before'] = array_unique(array_merge(
$configArray[$code]['before'], $configArray[$beforeCode]['before']
));
$configArray[$beforeCode]['after'] = array_merge(
$configArray[$beforeCode]['after'], array($code), $data['after']
);
$configArray[$beforeCode]['after'] = array_unique($configArray[$beforeCode]['after']);
if (!isset($configArray[$beforeCode])) continue;
$edges[] = array($_code, $beforeCode);
}
foreach ($data['after'] as $afterCode) {
if (!isset($configArray[$afterCode])) {
continue;
}
$configArray[$code]['after'] = array_unique(array_merge(
$configArray[$code]['after'], $configArray[$afterCode]['after']
));
$configArray[$afterCode]['before'] = array_merge(
$configArray[$afterCode]['before'], array($code), $data['before']
);
$configArray[$afterCode]['before'] = array_unique($configArray[$afterCode]['before']);
if (!isset($configArray[$afterCode])) continue;
$edges[] = array($afterCode, $_code);
}
}
uasort($configArray, array($this, '_compareTotals'));
$sortedCollectors = $this->_topologicalSort($nodes, $edges);

if (is_null($sortedCollectors)) {
throw new Mage_Sales_Exception('Total ordering before/after conditions can not be complied with');
}
}
$sortedCollectors = array_keys($configArray);
if (Mage::app()->useCache('config')) {
Mage::app()->saveCache(serialize($sortedCollectors), $this->_collectorsCacheKey, array(
Mage_Core_Model_Config::CACHE_TAG
Expand All @@ -195,27 +226,6 @@ protected function _initCollectors()
return $this;
}

/**
* Callback that uses after/before for comparison
*
* @param array $a
* @param array $b
* @return int
*/
protected function _compareTotals($a, $b)
{
$aCode = $a['_code'];
$bCode = $b['_code'];
if (in_array($aCode, $b['after']) || in_array($bCode, $a['before'])) {
$res = -1;
} elseif (in_array($bCode, $a['after']) || in_array($aCode, $b['before'])) {
$res = 1;
} else {
$res = 0;
}
return $res;
}

/**
* Callback that uses sort_order for comparison
*
Expand Down