From 8913e000f4d9f5a70a0e5ae95abece5e118ea26a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 11 Jul 2023 20:14:48 +0800
Subject: [PATCH] 1

---
 server/web3dbspider/services/dbevent_process.js          | 8 +++++---
 .../services/events/common/BaseEventProcess.js           | 9 +++------
 server/web3dbspider/services/pull_dbevent.js             | 6 ++++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/server/web3dbspider/services/dbevent_process.js b/server/web3dbspider/services/dbevent_process.js
index 1afd2df..0a03c3c 100644
--- a/server/web3dbspider/services/dbevent_process.js
+++ b/server/web3dbspider/services/dbevent_process.js
@@ -9,6 +9,8 @@ const eventsFactory = require('./events/factory');
 
 const LIMIT_COUNT = 100;
 
+let g_bcevent_conn = null;
+
 class DbEventProcess extends BaseService {
 
   static #tableMaxIdxHash = {};
@@ -16,6 +18,7 @@ class DbEventProcess extends BaseService {
   static async staticInit() {
     const {err, conn} = await app.getDbConn(constant.BCEVENTDB_NAME);
     const tables = metaFactory.getAllTables();
+    g_bcevent_conn = conn;
     await utils.serial
     (
       Object.values(tables),
@@ -50,8 +53,7 @@ class DbEventProcess extends BaseService {
     this.eventConf = this.event['eventConf'];
     this.progInfo = this.event['progressInfo'];
     this.contractAddress = this.net.getContractAddressByName(this.getContractName());
-    const {err, conn} = await app.getDbConn(constant.BCEVENTDB_NAME);
-    this.conn = conn;
+    this.conn = g_bcevent_conn;
     this.lastIdx = await this.getLastIdx();
     this.progInfo['proclastIdx'] = this.lastIdx.toString();
     this.eventHandle = eventsFactory.getEventHandle(this);
@@ -93,13 +95,13 @@ class DbEventProcess extends BaseService {
         throw err;
       }
       if (rows.length > 0) {
+        this.progInfo['procEventCount'] += rows.length;
         await utils.serial(
           rows,
           async (row) => {
             await this.process(row);
           }
         );
-        this.progInfo['procEventCount'] += rows.length;
       } else {
         this.lastIdx = endIdx;
       }
diff --git a/server/web3dbspider/services/events/common/BaseEventProcess.js b/server/web3dbspider/services/events/common/BaseEventProcess.js
index d58197e..0f3c8b1 100644
--- a/server/web3dbspider/services/events/common/BaseEventProcess.js
+++ b/server/web3dbspider/services/events/common/BaseEventProcess.js
@@ -75,15 +75,12 @@ class BaseEventProcess {
   }
 
   async markOk() {
-    const {err} = await this.updateEventDb(
+    await this.updateEventDb(
       [
-        ['state', constant.EVENTDB_STATE_HANDLED],
+        ['status', constant.EVENTDB_STATE_HANDLED],
         ['modifytime', utils.getUtcTime()],
       ]
     );
-    if (err) {
-      this.throwError('markOk error');
-    }
   }
 
   async updateEventDb(fields) {
@@ -93,7 +90,7 @@ class BaseEventProcess {
         'update',
         this.eventProc.getTableName(),
         [
-          ['idx', this.getEventDb['idx']],
+          ['idx', this.getEventDb()['idx']],
         ],
         fields
       );
diff --git a/server/web3dbspider/services/pull_dbevent.js b/server/web3dbspider/services/pull_dbevent.js
index 795f0a6..334e4f8 100644
--- a/server/web3dbspider/services/pull_dbevent.js
+++ b/server/web3dbspider/services/pull_dbevent.js
@@ -8,6 +8,8 @@ const BaseService = require('./baseservice');
 const LIMIT_COUNT = 100;
 const BCEVENT_TABLE_NAME = 't_blockchain_event';
 
+let g_bcevent_conn = null;
+
 class PullDbEvent extends BaseService {
 
   static #maxIdx = BigInt(0);
@@ -21,6 +23,7 @@ class PullDbEvent extends BaseService {
       }
       PullDbEvent.#maxIdx = maxIdx;
     }
+    g_bcevent_conn = conn;
     const updateMaxIdxFunc = async () => {
       while (true) {
         const {err, maxIdx} = await conn.getMaxIdx(BCEVENT_TABLE_NAME);
@@ -36,8 +39,7 @@ class PullDbEvent extends BaseService {
   }
 
   async init(net, event) {
-    const {err, conn} = await app.getDbConn(constant.BCEVENTDB_NAME);
-    this.conn = conn;
+    this.conn = g_bcevent_conn;
     this.net = net;
     this.event = event;
     this.eventConf = this.event['eventConf'];