hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1499 Increase default task memory overflow

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-10-02 11:33:49 +02:00
parent 5e6a6c9702
commit b66da8861a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/task/abstract.php
View File

@@ -26,8 +26,10 @@ abstract class task_abstract
const MINRECS = 10; const MINRECS = 10;
const MAXRECS = 100; const MAXRECS = 100;
// default min/max values for the 'overflow memory (Mo)' setting on tasks // default min/max values for the 'overflow memory (Mo)' setting on tasks
const MINMEGS = 20; const MINMEGS = 64;
const MAXMEGS = 256; const MAXMEGS = 256;
// default memory value
const DEFMEGS = 92;
// default min/max values for the 'period (seconds)' setting on tasks // default min/max values for the 'period (seconds)' setting on tasks
const MINPERIOD = 10; const MINPERIOD = 10;
const MAXPERIOD = 3600; const MAXPERIOD = 3600;
@@ -775,7 +777,7 @@ abstract class task_abstract
$this->maxmegs = (integer) $sx_task_settings->maxmegs; $this->maxmegs = (integer) $sx_task_settings->maxmegs;
if ($sx_task_settings->maxmegs < self::MINMEGS || $sx_task_settings->maxmegs > self::MAXMEGS) { if ($sx_task_settings->maxmegs < self::MINMEGS || $sx_task_settings->maxmegs > self::MAXMEGS) {
$this->maxmegs = self::MINMEGS; $this->maxmegs = self::DEFMEGS;
} }
$this->record_buffer_size = (integer) $sx_task_settings->flush; $this->record_buffer_size = (integer) $sx_task_settings->flush;

6
lib/classes/task/period/subdef.php
View File

@@ -14,11 +14,7 @@ use MediaAlchemyst\Transmuter\Image2Image;
class task_period_subdef extends task_databoxAbstract class task_period_subdef extends task_databoxAbstract
{ {
const MINMEGS = 20;
const MAXMEGS = 64;
const MINFLUSH = 10; const MINFLUSH = 10;
const MAXFLUSH = 100;
/** /**
* Record buffer for writing meta datas after building subdefs * Record buffer for writing meta datas after building subdefs
@@ -360,7 +356,7 @@ class task_period_subdef extends task_databoxAbstract
$period = isset($params['period']) ? $params['period'] : self::MINPERIOD; $period = isset($params['period']) ? $params['period'] : self::MINPERIOD;
$flush = isset($params['flush']) ? $params['flush'] : self::MINFLUSH; $flush = isset($params['flush']) ? $params['flush'] : self::MINFLUSH;
$maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS; $maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS;
$maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::MINMEGS; $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::DEFMEGS;
return sprintf('<?xml version="1.0" encoding="UTF-8"?> return sprintf('<?xml version="1.0" encoding="UTF-8"?>
<tasksettings> <tasksettings>

2
lib/classes/task/period/writemeta.php
View File

@@ -344,7 +344,7 @@ class task_period_writemeta extends task_databoxAbstract
{ {
$period = isset($params['period']) ? $params['period'] : self::MINPERIOD; $period = isset($params['period']) ? $params['period'] : self::MINPERIOD;
$maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS; $maxrecs = isset($params['maxrecs']) ? $params['maxrecs'] : self::MINRECS;
$maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::MINMEGS; $maxmegs = isset($params['maxmegs']) ? $params['maxmegs'] : self::DEFMEGS;
return sprintf('<?xml version="1.0" encoding="UTF-8"?> return sprintf('<?xml version="1.0" encoding="UTF-8"?>
<tasksettings> <tasksettings>