|
|
@@ -180,13 +180,10 @@ class InsertDataJob
|
|
|
{
|
|
|
// 确保数据是数组
|
|
|
if (!is_array($data)) {
|
|
|
- Log::error('队列任务数据格式错误', ['data_type' => gettype($data)]);
|
|
|
$job->delete();
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- Log::info('开始执行工资计算队列任务', ['data_keys' => array_keys($data)]);
|
|
|
-
|
|
|
try {
|
|
|
$taskId = isset($data['task_id']) ? (int)$data['task_id'] : 0;
|
|
|
|
|
|
@@ -212,10 +209,6 @@ class InsertDataJob
|
|
|
]);
|
|
|
}
|
|
|
|
|
|
- Log::info('工资计算任务执行成功', [
|
|
|
- 'month' => $data['date'] ?? 'unknown',
|
|
|
- 'result' => $result
|
|
|
- ]);
|
|
|
} else {
|
|
|
// 任务失败
|
|
|
if ($job->attempts() >= 3) {
|
|
|
@@ -227,18 +220,16 @@ class InsertDataJob
|
|
|
'retry_count' => $job->attempts()
|
|
|
]);
|
|
|
}
|
|
|
- Log::error('工资计算任务重试超过3次失败', ['error' => $result['message']]);
|
|
|
+
|
|
|
} else {
|
|
|
$delay = $this->getRetryDelay($job->attempts());
|
|
|
$job->release($delay);
|
|
|
- Log::warning('工资计算任务重试', ['attempts' => $job->attempts(), 'delay' => $delay]);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
|
- Log::error('工资计算队列任务异常: ' . $e->getMessage(), [
|
|
|
- 'exception' => $e->getTraceAsString()
|
|
|
- ]);
|
|
|
+
|
|
|
|
|
|
$taskId = isset($data['task_id']) ? (int)$data['task_id'] : 0;
|
|
|
|