),
'old' => array(
- 'desc' => 'Show old messages..',
+ 'desc' => 'Show old messages.. (and new messages...)',
'default' => 0,
'short' => 'o',
'min' => 0,
*/
var $max_to_domain = 10;
+ /**
+ * @var $maxruntime - maximum time a child is allowed to run - defaut 2 minutes
+ */
+ var $maxruntime = 120;
+
var $table = 'core_notify';
var $target = 'Core/NotifySend';
var $evtype = ''; // any notification...
if (!$ff->cli) {
die("access denied");
}
- HTML_FlexyFramework::ensureSingle(__FILE__, $this);
+ HTML_FlexyFramework::ensureSingle($_SERVER["SCRIPT_NAME"] .'|'. __FILE__, $this);
return true;
-
}
var $pool = array();
- function get($r,$opts)
+ function parseArgs(&$opts)
{
if ($opts['debug']) {
DB_DataObject::debugLevel($opts['debug']);
if (empty($opts['limit'])) {
$opts['limit'] = '1000'; // not sure why it's not picking up the defautl..
}
- //date_default_timezone_set('UTC');
- // phpinfo();exit;
- $showold = !empty($opts['old']);
+
if (!empty($opts['old'])) {
$opts['list'] = 1; // force listing..
}
if (!empty($opts['send-to'])) {
$this->send_to = $opts['send-to'];
}
-
-
- $w = DB_DataObject::factory('core_notify_recur');
- if (is_a($w, 'DB_DataObject')) {
- $w->generateNotifications();
- }
+ }
+
+
+ function get($r,$opts)
+ {
+ $this->parseArgs($opts);
+
+ //date_default_timezone_set('UTC');
+ // phpinfo();exit;
if (!empty($opts['generate'])) {
$w = DB_DataObject::factory($opts['generate']);
if (is_a($w, 'DB_DataObject')) {
$w->generateNotifications();
}
exit;
-
-
}
+
+
+ $w = DB_DataObject::factory('core_notify_recur');
+ if (is_a($w, 'DB_DataObject')) {
+ $w->generateNotifications();
+ }
+
//DB_DataObject::debugLevel(1);
$w = DB_DataObject::factory($this->table);
+ $total = 0;
-
- if (!$showold) {
+ if (!empty($opts['old'])) {
+ // show old and new...
+ $w->orderBy('act_when DESC'); // latest first
+ $w->limit($opts['limit']); // we can run
+ $total = min($w->count(), $opts['limit']);
+ } else {
// standard
//$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
}
$w->orderBy('act_when ASC'); // oldest first.
-
- $this->Log("QUEUE is {$w->count()}");
+ $total = min($w->count(), $opts['limit']);
+ $this->logecho("QUEUE is {$w->count()} only running " . ((int) $opts['limit']));
- $w->limit($opts['limit']); // we can run 1000 ...
- } else {
- $w->orderBy('act_when DESC'); // latest first
$w->limit($opts['limit']); // we can run 1000 ...
}
+
if (!empty($this->evtype)) {
$w->evtype = $this->evtype;
}
$w->autoJoin();
+ $w->find();
-
- $ar = $w->fetchAll();
+ $ar = array(); // $w->fetchAll();
if (!empty($opts['list'])) {
- if (empty($ar)) {
- die("Nothing in Queue\n");
- }
- foreach($ar as $w) {
+
+
+ while ($w->fetch()) {
$o = $w->object();
- $this->log("$w->id : $w->person_id_email email : ".
+ $this->logecho("{$w->id} : {$w->person()->email} email : ".
$o->toEventString()." ". $w->status() );
}
exit;
$pushed = array();
$requeue = array();
while (true) {
+ if ($w->fetch()) {
+ $ar[] = clone($w);
+ $total--;
+ }
-
- $this->log("BATCH SIZE: ". count($ar) );
+ $this->logecho("BATCH SIZE: ". (count($ar) + $total) );
if (empty($ar)) {
- $this->log("COMPLETED MAIN QUEUE - running delated");
+ $this->logecho("COMPLETED MAIN QUEUE - running deleted");
if (empty($pushed)) {
break;
sleep(3);
continue;
}
- if ($this->poolHasDomain($p->person_id_email) > $this->max_to_domain) {
+ if ($this->poolHasDomain($p->person()->email) > $this->max_to_domain) {
if ($pushed === false) {
// we only try once to requeue..
}
- $this->run($p->id,$p->person_id_email);
+ $this->run($p->id,$p->person()->email);
}
-
- die("DONE\n");
+ $this->logecho("DONE");
+ exit;
}
function run($id, $email, $cmdOpts="")
$pipe = array();
- $this->log("call proc_open $cmd");
+ $this->logecho("call proc_open $cmd");
if ($this->max_pool_size === 1) {
if (!empty($this->opts['dryrun'])) {
- $this->log("DRY RUN");
+ $this->logecho("DRY RUN");
return;
}
'cmd' => $cmd,
'email' => $email,
'pipes' => $pipes,
+ 'notify_id' => $id,
'started' => time()
);
- $this->log("RUN ({$info['pid']}) $cmd ");
+ $this->logecho("RUN ({$info['pid']}) $cmd ");
}
function poolfree()
{
$pool = array();
clearstatcache();
- $maxruntime = 2 * 60; // 2 minutes.. ?? should be long enoguh
-
+
foreach($this->pool as $p) {
//echo "CHECK PID: " . $p['pid'] . "\n";
// update if necessday.
if ($info['pid'] && $p['pid'] != $info['pid']) {
- $this->log("CHANING PID FROM " . $p['pid'] . " TO ". $info['pid']);
+ $this->logecho("CHANING PID FROM " . $p['pid'] . " TO ". $info['pid']);
$p['pid'] = $info['pid'];
}
//if (file_exists('/proc/'.$p['pid'])) {
$runtime = time() - $p['started'];
//echo "RUNTIME ({$p['pid']}): $runtime\n";
- if ($runtime > $maxruntime) {
+ if ($runtime > $this->maxruntime) {
proc_terminate($p['proc'], 9);
//fclose($p['pipes'][1]);
fclose($p['pipes'][0]);
fclose($p['pipes'][2]);
- $this->log("TERMINATING: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']));
+ $this->logecho("TERMINATING: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']));
@unlink($p['out']);
+ $w = DB_DataObject::factory($this->table);
+ $w->get($p['notify_id']);
+ $ww = clone($w);
+ $this->addEvent('NOTIFY', $w, 'TERMINATED - TIMEOUT');
+ $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 30 MINUTES'));
+ $w->update($ww);
+
+
continue;
}
// $pool[] = $p;
// continue;
//}
- $this->log("ENDED: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']) );
+ $this->logecho("ENDED: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']) );
@unlink($p['out']);
//unlink($p['out']);
}
- $this->log("POOL SIZE: ". count($pool) );
+ $this->logecho("POOL SIZE: ". count($pool) );
$this->pool = $pool;
if (count($pool) < $this->max_pool_size) {
return true;
function output()
{
- die("Done\n");
+ $this->logecho("DONE");
+ exit;
}
- function log($str)
+ function logecho($str)
{
- echo date("Y-m-d H:i:s - $str\n");
+ echo date("Y-m-d H:i:s - ") . $str . "\n";
}
}
\ No newline at end of file
projects / Pman.Core / blobdiff