diff --git a/server/web3bcspider/metadata/factory.js b/server/web3bcspider/metadata/factory.js index 584b1d3..76c9494 100644 --- a/server/web3bcspider/metadata/factory.js +++ b/server/web3bcspider/metadata/factory.js @@ -119,6 +119,7 @@ async function init() { web3ConfHash[netId] = { 'Web3': utils.readJsonFromFile(netDir + 'web3.json'), 'Contract': utils.readJsonFromFile(netDir + 'contract.json'), + 'Events': net['events'], }; }); } @@ -184,7 +185,7 @@ function getNetList() { const netList = []; const keys = Object.keys(web3ConfHash); for (let i = 0; i < keys.length; ++i) { - netList.push(keys[i]); + netList.push(web3ConfHash[keys[i]]); } return netList; } diff --git a/server/web3bcspider/services/blockchain.js b/server/web3bcspider/services/blockchain.js index eac1a2d..831b800 100644 --- a/server/web3bcspider/services/blockchain.js +++ b/server/web3bcspider/services/blockchain.js @@ -5,6 +5,7 @@ const sync = require("j7/sync"); const log = require("j7/log"); const metaFactory = require('../metadata/factory'); const bcClass = require('../blockchain'); +const BaseService = require('./baseservice'); const netIdHash = {}; diff --git a/server/web3bcspider/services/factory.js b/server/web3bcspider/services/factory.js index 395a9e6..02c2d3e 100644 --- a/server/web3bcspider/services/factory.js +++ b/server/web3bcspider/services/factory.js @@ -12,8 +12,8 @@ function add(clsNames, modName) { } async function init() { - add('BlockChain', 'blockchain'); - add('PullBcEvent', 'pull_bcevent'); + add(['BlockChain'], 'blockchain'); + add(['PullBcEvent'], 'pull_bcevent'); } function create(name, session) { diff --git a/server/web3bcspider/tasks/bcspider.js b/server/web3bcspider/tasks/bcspider.js index d218cc1..49029f1 100644 --- a/server/web3bcspider/tasks/bcspider.js +++ b/server/web3bcspider/tasks/bcspider.js @@ -20,6 +20,7 @@ class BcSpider extends BaseTask { async initNet(net) { const events = []; + console.log(net); net['Events'].forEach ( (eventConf) => { diff --git a/server/web3bcspider/tasks/factory.js b/server/web3bcspider/tasks/factory.js index 3b00b4e..9aacc28 100644 --- a/server/web3bcspider/tasks/factory.js +++ b/server/web3bcspider/tasks/factory.js @@ -14,11 +14,14 @@ function add(clsNames, modName) { } async function init() { - add('BcSpider', 'bcspider'); + add(['BcSpider'], 'bcspider'); const initTasks = [ 'BcSpider' ]; await utils.serial( + [ + 'BcSpider' + ], async (name) => { const task = create(name);