Skip to content

Commit c600d56

Browse files
committed
1.0.9
Fix MongoDB Connection URI Issues Added Better Logging System
1 parent 53c5c8e commit c600d56

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

src/main/java/i/fran2019/BotMaster/BotMaster.java

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,9 @@ public static void main(String[] args) {
4747

4848
private void start() {
4949
Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
50-
5150
logger.info("Starting Bot");
51+
5252
this.configManager = new ConfigManager();
53-
if (configManager.DEBUG) {
54-
ch.qos.logback.classic.Logger lg = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BotMaster.class); lg.setLevel(Level.DEBUG);
55-
}
5653

5754
loadClients();
5855

@@ -98,6 +95,12 @@ private void build() {
9895
}
9996

10097
private void loadClients() {
98+
// ═══════════════════════════════════════════════
99+
// ║ DEBUG ║
100+
// ═══════════════════════════════════════════════
101+
102+
ch.qos.logback.classic.Logger lgr = (ch.qos.logback.classic.Logger) LoggerFactory.getILoggerFactory().getLogger("ROOT");
103+
lgr.setLevel(configManager.DEBUG ? Level.DEBUG : Level.INFO);
101104

102105
// ═══════════════════════════════════════════════
103106
// ║ MONGODB ║
@@ -113,16 +116,21 @@ private void loadClients() {
113116
SSLContext stcF = sct;
114117

115118
String uri = this.configManager.MONGODB_URI;
116-
if (!uri.contains("/")) uri += "/";
117-
if (!uri.contains("?")) uri += "?tls=true";
118-
else if (!uri.contains("tls=")) uri += "&tls=true";
119+
boolean isLocal = uri.contains("localhost") || uri.contains("127.0.0.1");
120+
boolean isSrv = uri.startsWith("mongodb+srv://");
121+
122+
if (!isLocal && !uri.contains("tls=") && !isSrv) {
123+
if (!uri.contains("/")) uri += "/";
124+
if (!uri.contains("?")) uri += "?tls=true";
125+
else uri += "&tls=true";
126+
}
119127

120128
this.mongoClient = this.configManager.MONGODB_ENABLED ? MongoClients.create(
121129
MongoClientSettings.builder()
122130
.applyConnectionString(new ConnectionString(uri))
123131
.applyToSslSettings(builder -> {
124-
builder.enabled(true);
125-
builder.context(stcF);
132+
builder.enabled(!isLocal && !isSrv);
133+
builder.context(!isLocal && !isSrv ? stcF : null);
126134
builder.invalidHostNameAllowed(false);
127135
})
128136
.build()

src/main/resources/logback.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</encoder>
77
</appender>
88

9+
910
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
1011
<file>logs/app.log</file>
1112
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -17,14 +18,10 @@
1718
</encoder>
1819
</appender>
1920

20-
<logger name="org.mongodb.driver.protocol.command" level="OFF" />
21-
<logger name="org.mongodb.driver" level="debug" />
22-
23-
<logger name="ROOT" level="debug" additivity="false">
24-
<appender-ref ref="FILE" />
25-
</logger>
21+
<logger name="org.mongodb.driver.protocol.command" level="OFF" additivity="false" />
2622

2723
<root level="info">
2824
<appender-ref ref="STDOUT" />
25+
<appender-ref ref="FILE" />
2926
</root>
3027
</configuration>

0 commit comments

Comments
 (0)