forked from extern/egroupware
class var to enable/disable memory_usage reporting to error_log
This commit is contained in:
parent
c9f45a82ff
commit
7bfa13728d
@ -86,6 +86,13 @@ abstract class bo_merge
|
|||||||
*/
|
*/
|
||||||
protected $parse_html_styles = true;
|
protected $parse_html_styles = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable this to report memory_usage to error_log
|
||||||
|
*
|
||||||
|
* @var boolean
|
||||||
|
*/
|
||||||
|
public $report_memory_usage = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*
|
*
|
||||||
@ -738,7 +745,7 @@ abstract class bo_merge
|
|||||||
$err = lang('for more than one contact in a document use the tag pagerepeat!');
|
$err = lang('for more than one contact in a document use the tag pagerepeat!');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
|
if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
|
||||||
foreach ((array)$ids as $n => $id)
|
foreach ((array)$ids as $n => $id)
|
||||||
{
|
{
|
||||||
if ($contentrepeat) $content = $contentrepeat; //content to repeat
|
if ($contentrepeat) $content = $contentrepeat; //content to repeat
|
||||||
@ -759,7 +766,7 @@ abstract class bo_merge
|
|||||||
$err = $e->getMessage();
|
$err = $e->getMessage();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
//error_log(__METHOD__."() $n: $id ".egw_vfs::hsize(memory_get_usage(true)));
|
if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".egw_vfs::hsize(memory_get_usage(true)));
|
||||||
// some general replacements: current user, date and time
|
// some general replacements: current user, date and time
|
||||||
if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
|
if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
|
||||||
{
|
{
|
||||||
@ -860,6 +867,7 @@ abstract class bo_merge
|
|||||||
$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
|
$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if ($this->report_memory_usage) error_log(__METHOD__."() returning ".egw_vfs::hsize(memory_get_peak_usage(true)));
|
||||||
|
|
||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
@ -1533,6 +1541,7 @@ abstract class bo_merge
|
|||||||
return $err;
|
return $err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
|
||||||
}
|
}
|
||||||
if(!empty($name))
|
if(!empty($name))
|
||||||
{
|
{
|
||||||
@ -1563,6 +1572,7 @@ abstract class bo_merge
|
|||||||
{
|
{
|
||||||
exec('/usr/bin/zip -F '.escapeshellarg($archive));
|
exec('/usr/bin/zip -F '.escapeshellarg($archive));
|
||||||
}
|
}
|
||||||
|
if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".egw_vfs::hsize(memory_get_peak_usage(true)));
|
||||||
html::content_header($name,$mimetype,filesize($archive));
|
html::content_header($name,$mimetype,filesize($archive));
|
||||||
readfile($archive,'r');
|
readfile($archive,'r');
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user