From f623f77e1b888b31ff6e480579e4fa2a79497a79 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 12 Jul 2023 20:41:53 +0800
Subject: [PATCH] 1

---
 server/web3bcspider/services/pull_bcevent.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/web3bcspider/services/pull_bcevent.js b/server/web3bcspider/services/pull_bcevent.js
index 39049f3..6b83ba3 100644
--- a/server/web3bcspider/services/pull_bcevent.js
+++ b/server/web3bcspider/services/pull_bcevent.js
@@ -47,7 +47,7 @@ class PullBcEvent extends BaseService {
   }
 
   async pullEvent() {
-    const logHead = this.getInstanceName() + ' pullEvent: ';
+    const logHead = this.genLogHead(' pullEvent: ');
     while (true) {
       await this.bc.lockQuery();
       try {
@@ -103,7 +103,7 @@ class PullBcEvent extends BaseService {
   }
 
   async getFromBlock() {
-    const logHead = this.getInstanceName() + ' getFromBlock: ';
+    const logHead = this.genLogHead(' getFromBlock: ');
     const firstBlockNumber = this.getInitBlock();
     while (this.lastBlockNumber < 1) {
       try {
@@ -151,7 +151,7 @@ class PullBcEvent extends BaseService {
   }
 
   async saveLastBlockNumber(blockNumber) {
-    const logHead = this.getInstanceName() + ' event_process.saveLastBlockNumber: ';
+    const logHead = this.genLogHead(' event_process.saveLastBlockNumber: ');
     while (true) {
       const {err} = await this.conn.upsert(
         't_last_block',
@@ -184,7 +184,7 @@ class PullBcEvent extends BaseService {
   }
 
   async saveToDb(event) {
-    const logHead = this.getInstanceName() + ' event_process.saveToDb: ';
+    const logHead = this.genLogHead(' event_process.saveToDb: ');
     while (true) {
       const nowTime = utils.getUtcTime();
       const returnValues = event['returnValues'];
@@ -247,9 +247,10 @@ class PullBcEvent extends BaseService {
     return this.eventConf['contract_name'];
   }
 
-  getInstanceName() {
-    const instName = this.getNetId() + '.' + this.getContractName() + '.' + this.getEventName();
-    return instName;
+  genLogHead(msg) {
+    const logHead = this.getNetId() + ' ' + this.getContractName() + '.' +
+          this.getEventName() + ' pull_bcevent ' + msg;
+    return logHead;
   }
 
 }