Skip to content

Commit 24ab53a

Browse files
committed
debug with java-tron, fix bugs
1 parent 6fb34fc commit 24ab53a

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

app/src/main/java/org/tron/eventplugin/app/PluginLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected CompoundPluginDescriptorFinder createPluginDescriptorFinder() {
5757
if (Objects.isNull(eventListeners)) return;
5858

5959
eventListeners.forEach(listener -> {
60-
listener.setServerAddress("127.0.0.1:9092");
60+
listener.setServerAddress("127.0.0.1:27017");
6161
});
6262

6363
eventListeners.forEach(listener -> {

plugins/mongodbplugin/src/main/java/org/tron/eventplugin/MongodbSenderImpl.java

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package org.tron.eventplugin;
2+
import org.pf4j.util.StringUtils;
23
import org.slf4j.Logger;
34
import org.slf4j.LoggerFactory;
45
import java.util.*;
@@ -45,8 +46,8 @@ public static MongodbSenderImpl getInstance(){
4546
return instance;
4647
}
4748

48-
public void setServerAddress(String address){
49-
this.serverAddress = address;
49+
public void setServerAddress(final String address){
50+
initMongoConfig(address);
5051
}
5152

5253
public void init(){
@@ -57,24 +58,46 @@ public void init(){
5758

5859
triggerProcessThread = new Thread(triggerProcessLoop);
5960
triggerProcessThread.start();
60-
loaded = true;
6161

62-
initMongoConfig();
62+
mongoTemplateMap = new HashMap<>();
6363

64+
loaded = true;
6465
}
6566

66-
private void initMongoConfig(){
67-
mongoManager = new MongoManager();
68-
mongoTemplateMap = new HashMap<>();
67+
private void initMongoConfig(String serverAddress){
68+
if (StringUtils.isNullOrEmpty(serverAddress)){
69+
return;
70+
}
71+
72+
String[] params = serverAddress.split(":");
73+
if (params.length != 2){
74+
return;
75+
}
76+
77+
String hostName = "";
78+
int port = -1;
79+
80+
try{
81+
hostName = params[0];
82+
port = Integer.valueOf(params[1]);
83+
}
84+
catch (Exception e){
85+
e.printStackTrace();
86+
return;
87+
}
6988

7089
MongoConfig config = new MongoConfig();
7190
config.setDbName("eventlog");
72-
config.setHost("127.0.0.1");
73-
config.setPort(27017);
91+
config.setHost(hostName);
92+
config.setPort(port);
93+
7494
config.setUsername("tron");
7595
config.setPassword("123456");
7696

77-
mongoManager.initConfig(config);
97+
if (Objects.isNull(mongoManager)){
98+
mongoManager = new MongoManager();
99+
mongoManager.initConfig(config);
100+
}
78101
}
79102

80103
private MongoTemplate createMongoTemplate(final String collectionName){
@@ -138,6 +161,7 @@ public void handleBlockEvent(Object data) {
138161
MongoTemplate template = mongoTemplateMap.get(blockTopic);
139162
if (Objects.nonNull(template)){
140163
template.addEntity((String)data);
164+
System.out.println("handleBlockEvent " + data);
141165
}
142166
}
143167

plugins/mongodbplugin/src/main/java/org/tron/mongodb/MongoManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import com.mongodb.ServerAddress;
77
import com.mongodb.client.MongoDatabase;
88
import org.pf4j.util.StringUtils;
9-
import org.tron.common.logsfilter.trigger.BlockLogTrigger;
10-
import org.tron.eventplugin.Constant;
11-
129
import java.util.ArrayList;
1310
import java.util.List;
1411
import java.util.Objects;

plugins/mongodbplugin/src/main/java/org/tron/mongodb/MongoTemplate.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public void add(Document document) {
3737

3838
public void addEntity(String entity) {
3939
MongoCollection<Document> collection = getCollection();
40-
collection.insertOne(Converter.jsonStringToDocument(entity));
40+
if (Objects.nonNull(collection)){
41+
collection.insertOne(Converter.jsonStringToDocument(entity));
42+
}
4143
}
4244

4345
public void addList(List<Document> documents) {
@@ -167,7 +169,7 @@ private <T> List<T> getEntityList(FindIterable<Document> findIterable) {
167169
}
168170

169171
private MongoCollection<Document> getCollection() {
170-
if (Objects.isNull(manager)){
172+
if (Objects.isNull(manager) || Objects.isNull(manager.getDb())){
171173
return null;
172174
}
173175

0 commit comments

Comments
 (0)