Skip to content

Z
zhichan
Commit 5b9aadfd by 宋毅
Options

tj

parent 54149771
Showing with 8 additions and 1 deletions
brg-queue-center/app/base/db/consumer.base.js
...@@ -50,6 +50,8 @@ class ConsumerBase { ...@@ -50,6 +50,8 @@ class ConsumerBase {
execResult = await this.subDoConsumer(queuedName, actionBody); execResult = await this.subDoConsumer(queuedName, actionBody);
if (notifyQueuedName != queuedName) { if (notifyQueuedName != queuedName) {
actionBody.resultInfo = execResult; actionBody.resultInfo = execResult;
} else {
actionBody.pushAgainResultInfo = execResult;
} }
if (execResult.status === 1) { if (execResult.status === 1) {
if (notifyQueuedName != queuedName) { if (notifyQueuedName != queuedName) {
...@@ -76,7 +78,6 @@ class ConsumerBase { ...@@ -76,7 +78,6 @@ class ConsumerBase {
delete actionBody["pushAgainResultInfo"]; delete actionBody["pushAgainResultInfo"];
} }
execResult = await this.subDoConsumer(queuedName, actionBody); execResult = await this.subDoConsumer(queuedName, actionBody);
actionBody.pushAgainResultInfo = execResult;
} catch (error) { } catch (error) {
var stackStr = error.stack ? error.stack : JSON.stringify(error); var stackStr = error.stack ? error.stack : JSON.stringify(error);
this.errorLogDao.addOpErrorLogs("队列执行execSubDoConsumer存在异常", actionBody, execResult, stackStr, 3); this.errorLogDao.addOpErrorLogs("队列执行execSubDoConsumer存在异常", actionBody, execResult, stackStr, 3);
......
brg-queue-center/app/base/db/impl/opLogs/pushFailureLogDao.js
const system = require("../../../system"); const system = require("../../../system");
const Dao = require("../../dao.base"); const Dao = require("../../dao.base");
const settings = require("../../../../config/settings");
class PushFailureLogDao extends Dao { class PushFailureLogDao extends Dao {
constructor() { constructor() {
super(Dao.getModelName(PushFailureLogDao)); super(Dao.getModelName(PushFailureLogDao));
...@@ -12,6 +13,7 @@ class PushFailureLogDao extends Dao { ...@@ -12,6 +13,7 @@ class PushFailureLogDao extends Dao {
*/ */
async addOpFailureLogs(opTitle, actionBody, execResult) { async addOpFailureLogs(opTitle, actionBody, execResult) {
var params = { var params = {
queued_name: settings.queuedName,
identify_code: actionBody.identifyCode, identify_code: actionBody.identifyCode,
op_title: opTitle, op_title: opTitle,
push_content: actionBody, push_content: actionBody,
......
brg-queue-center/app/base/db/impl/opLogs/pushSuccessLogDao.js
const system = require("../../../system"); const system = require("../../../system");
const Dao = require("../../dao.base"); const Dao = require("../../dao.base");
const settings = require("../../../../config/settings");
class PushSuccessLogDao extends Dao { class PushSuccessLogDao extends Dao {
constructor() { constructor() {
super(Dao.getModelName(PushSuccessLogDao)); super(Dao.getModelName(PushSuccessLogDao));
...@@ -13,6 +14,7 @@ class PushSuccessLogDao extends Dao { ...@@ -13,6 +14,7 @@ class PushSuccessLogDao extends Dao {
*/ */
async addOpSuccessLogs(opTitle, actionBody, execResult) { async addOpSuccessLogs(opTitle, actionBody, execResult) {
var params = { var params = {
queued_name: settings.queuedName,
identify_code: actionBody.identifyCode, identify_code: actionBody.identifyCode,
op_title: opTitle, op_title: opTitle,
push_content: actionBody, push_content: actionBody,
......
brg-queue-center/app/base/db/models/opLogs/pushFailureLog.js
const system = require("../../../system"); const system = require("../../../system");
module.exports = (db, DataTypes) => { module.exports = (db, DataTypes) => {
return db.define("pushFailureLog", { return db.define("pushFailureLog", {
queued_name: DataTypes.STRING(512), //队列名称
identify_code: DataTypes.STRING(100), //标识code identify_code: DataTypes.STRING(100), //标识code
op_title: DataTypes.STRING(100), // 操作标题 op_title: DataTypes.STRING(100), // 操作标题
push_content: DataTypes.JSON, //推送的内容 push_content: DataTypes.JSON, //推送的内容
......
brg-queue-center/app/base/db/models/opLogs/pushSuccessLog.js
const system = require("../../../system"); const system = require("../../../system");
module.exports = (db, DataTypes) => { module.exports = (db, DataTypes) => {
return db.define("pushSuccessLog", { return db.define("pushSuccessLog", {
queued_name: DataTypes.STRING(512), //队列名称
identify_code: DataTypes.STRING(100), //标识code identify_code: DataTypes.STRING(100), //标识code
op_title: DataTypes.STRING(100), // 操作标题 op_title: DataTypes.STRING(100), // 操作标题
push_content: DataTypes.JSON, //推送的内容 push_content: DataTypes.JSON, //推送的内容
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment