//date_default_timezone_set('UTC');
// phpinfo();exit;
-
-
-
- $w = DB_DataObject::factory('core_notify_recur');
- if (is_a($w, 'DB_DataObject')) {
- $w->generateNotifications();
- }
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 (!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->orderBy('act_when ASC'); // oldest first.
-
- $this->logecho("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 ...
}
}
$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->logecho("$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->logecho("BATCH SIZE: ". count($ar) );
+ $this->logecho("BATCH SIZE: ". (count($ar) + $total) );
if (empty($ar)) {
- $this->logecho("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) {
+ $email = $p->person() ? $p->person()->email : $p->to_email;
+
+ if ($this->poolHasDomain($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,$email);
}
$cmd = 'exec ' . $php . ' ' . $app . ' ' . $cmdOpts; //. ' &';
- print_R($cmd);exit;
$pipe = array();
$this->logecho("call proc_open $cmd");
'cmd' => $cmd,
'email' => $email,
'pipes' => $pipes,
+ 'notify_id' => $id,
'started' => time()
$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;
}