Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* @brief Queue Task
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @since 04 Dec 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -36,123 +36,24 @@ class _queue extends \IPS\Task
|
||||
*/
|
||||
public function execute()
|
||||
{
|
||||
/* Work out the maximum execution time */
|
||||
$timeLeft = 45;
|
||||
if ( $phpMaxExecutionTime = ini_get('max_execution_time') and $phpMaxExecutionTime <= $timeLeft )
|
||||
{
|
||||
$timeLeft = $phpMaxExecutionTime - 2;
|
||||
}
|
||||
|
||||
/* Factor in wait_timeout if possible */
|
||||
try
|
||||
{
|
||||
$mysqlTimeout = \IPS\Db::i()->query( "SHOW SESSION VARIABLES LIKE 'wait_timeout'" )->fetch_assoc();
|
||||
$mysqlTimeout = $mysqlTimeout['Value'];
|
||||
|
||||
if( $mysqlTimeout <= $timeLeft )
|
||||
{
|
||||
$timeLeft = $mysqlTimeout - 2;
|
||||
}
|
||||
}
|
||||
catch( \IPS\Db\Exception $e ){}
|
||||
|
||||
$timeTheLastRunTook = 0;
|
||||
|
||||
/* Work out the memory limit */
|
||||
$memoryLeft = 0;
|
||||
$memoryUnlimited = FALSE;
|
||||
if ( function_exists( 'memory_get_usage' ) )
|
||||
{
|
||||
$memory_limit = ini_get('memory_limit');
|
||||
if ( $memory_limit == -1 )
|
||||
{
|
||||
$memoryUnlimited = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( preg_match('/^(\d+)(.)$/', $memory_limit, $matches ) )
|
||||
{
|
||||
if ( $matches[2] == 'M' )
|
||||
{
|
||||
$memory_limit = $matches[1] * 1024 * 1024;
|
||||
}
|
||||
elseif ( $matches[2] == 'K' )
|
||||
{
|
||||
$memory_limit = $matches[1] * 1024;
|
||||
}
|
||||
}
|
||||
$memoryLeft = $memory_limit - memory_get_usage( TRUE );
|
||||
}
|
||||
}
|
||||
$memoryTheLastRunTook = 0;
|
||||
|
||||
/* Run until we run out of time */
|
||||
do
|
||||
{
|
||||
$this->runUntilTimeout( function(){
|
||||
/* Try and get a queue item */
|
||||
try
|
||||
{
|
||||
/* Get it */
|
||||
$queueData = \IPS\Db::i()->select( '*', 'core_queue', NULL, 'priority ASC, RAND()', 1 )->first();
|
||||
|
||||
/* Start a timer */
|
||||
$timer = microtime( TRUE );
|
||||
$memoryTimer = function_exists( 'memory_get_usage' ) ? memory_get_usage( TRUE ) : 0;
|
||||
|
||||
/* Got one, try to run it */
|
||||
try
|
||||
{
|
||||
$extensions = \IPS\Application::load( $queueData['app'] )->extensions( 'core', 'Queue', FALSE );
|
||||
if ( !isset( $extensions[ $queueData['key'] ] ) )
|
||||
{
|
||||
throw new \OutOfRangeException;
|
||||
}
|
||||
|
||||
$class = new $extensions[ $queueData['key'] ];
|
||||
$data = json_decode( $queueData['data'], TRUE );
|
||||
$newOffset = $class->run( $data, $queueData['offset'] );
|
||||
|
||||
if ( is_null( $newOffset ) )
|
||||
{
|
||||
\IPS\Db::i()->delete( 'core_queue', array( 'id=?', $queueData['id'] ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
\IPS\Db::i()->update( 'core_queue', array( 'offset' => $newOffset ), array( 'id=?', $queueData['id'] ) );
|
||||
|
||||
$newData = json_encode( $data );
|
||||
|
||||
/* Did it change?? */
|
||||
if ( $newData !== $data )
|
||||
{
|
||||
\IPS\Db::i()->update( 'core_queue', array( 'data' => $newData ), array( 'id=?', $queueData['id'] ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
/* An error in running - delete it */
|
||||
catch ( \OutOfRangeException $e )
|
||||
{
|
||||
\IPS\Db::i()->delete( 'core_queue', array( 'id=?', $queueData['id'] ) );
|
||||
}
|
||||
|
||||
/* Decrease the time left */
|
||||
$timeTheLastRunTook = round( ( microtime( TRUE ) - $timer ), 2 );
|
||||
$timeLeft -= $timeTheLastRunTook;
|
||||
$memoryTheLastRunTook = function_exists( 'memory_get_usage' ) ? ( memory_get_usage( TRUE ) - $memoryTimer ) : 0;
|
||||
if ( !$memoryUnlimited )
|
||||
{
|
||||
$memoryLeft = $memory_limit - memory_get_usage( TRUE );;
|
||||
}
|
||||
/* Run the next queue task, if any */
|
||||
\IPS\Task::runQueue();
|
||||
|
||||
/* Continue */
|
||||
return TRUE;
|
||||
}
|
||||
/* If there's no queue items left, disable this task and return */
|
||||
catch ( \UnderflowException $e )
|
||||
{
|
||||
$this->enabled = FALSE;
|
||||
$this->save();
|
||||
return;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
while ( $timeLeft > $timeTheLastRunTook and ( $memoryUnlimited or $memoryLeft > $memoryTheLastRunTook ) );
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user