Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Optimize webhook asyncSend function.

Browse Source
This commit is contained in:
wangyuting
2023-08-11 17:06:28 +08:00
parent deff4c79a0
commit 05d04409f0
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/webhook/control.php
+22 -28
View File
@@ -347,41 +347,35 @@ class webhook extends control
public function asyncSend()
{
$webhooks = $this->webhook->getList($orderBy = 'id_desc', $pager = null, $decode = false);
if(empty($webhooks))
if(!empty($webhooks))
{
echo "NO WEBHOOK EXIST.\n";
}
$dataList = $this->webhook->getDataList();
if(empty($dataList))
{
echo "OK\n";
}
$this->webhook->setSentStatus(array_keys($dataList), 'senting');
$now = helper::now();
$diff = 0;
foreach($dataList as $data)
{
$webhook = zget($webhooks, $data->objectID, '');
if($webhook)
$dataList = $this->webhook->getDataList();
if(!empty($dataList))
{
/* if connect time is out then ignore it.*/
if($diff < 29)
$this->webhook->setSentStatus(array_keys($dataList), 'senting');
$diff = 0;
$result = '';
foreach($dataList as $data)
{
$time = time();
$result = $this->webhook->fetchHook($webhook, $data->data, $data->action);
$diff = time() - $time;
$webhook = zget($webhooks, $data->objectID, '');
if($webhook)
{
/* if connect time is out then ignore the rest.*/
if($diff < 30)
{
$time = time();
$result = $this->webhook->fetchHook($webhook, $data->data, $data->action);
$diff = time() - $time;
}
$this->webhook->saveLog($webhook, $data->action, $data->data, $result);
}
}
$this->webhook->saveLog($webhook, $data->action, $data->data, $result);
$this->dao->delete()->from(TABLE_NOTIFY)->where('id')->in(array_keys($dataList))->andWhere('status')->eq('senting')->exec();
}
$this->webhook->setSentStatus($data->id, 'sended', $now);
}
$this->dao->delete()->from(TABLE_NOTIFY)->where('status')->eq('sended')->exec();
echo "OK\n";
}
}
module/webhook/model.php
+1 -1
View File
@@ -152,7 +152,7 @@ class webhookModel extends model
public function getDataList()
{
$dataList = $this->dao->select('*')->from(TABLE_NOTIFY)->where('status')->eq('wait')->andWhere('objectType')->eq('webhook')->orderBy('id')->fetchAll('id');
$dataList += $this->dao->select('*')->from(TABLE_NOTIFY)->where('status')->eq('senting')->andWhere('sendTime')->ge(date('Y-m-d H:i:s', time() - 3 * 3600))->andWhere('objectType')->eq('webhook')->orderBy('id')->fetchAll('id');
$dataList += $this->dao->select('*')->from(TABLE_NOTIFY)->where('status')->eq('senting')->andWhere('objectType')->eq('webhook')->orderBy('id')->fetchAll('id');
return $dataList;
}