mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-09 21:18:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Missed a line in that last commit there

Browse Source
This commit is contained in:
NovaFox161
2020-08-14 21:00:44 -05:00
parent 4bd6dfecb1
commit b3cf6d44c0
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/dreamexposure/discal/core/calendar/CalendarAuth.java
View File

@@ -65,18 +65,23 @@ public class CalendarAuth {
private static final List<String> SCOPES = Arrays.asList(CalendarScopes.CALENDAR, CalendarScopes.CALENDAR_EVENTS);
private static final Map<Integer, FileDataStoreFactory> DATA_STORE_FACTORIES;
private static final Map<Integer, HttpTransport> HTTP_TRANSPORTS;
static {
try {
HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
final Map<Integer, FileDataStoreFactory> dataStoreFactories = new HashMap<>();
final Map<Integer, HttpTransport> transports = new HashMap<>();
final int credCount = Integer.parseInt(BotSettings.CREDENTIALS_COUNT.get());
for (int i = 0; i < credCount; i++) {
dataStoreFactories.put(i, new FileDataStoreFactory(getCredentialsFolder(i)));
transports.put(i, GoogleNetHttpTransport.newTrustedTransport());
}
DATA_STORE_FACTORIES = Collections.unmodifiableMap(dataStoreFactories);
HTTP_TRANSPORTS = Collections.unmodifiableMap(transports);
} catch (final Throwable t) {
t.printStackTrace();
System.exit(1);
@@ -135,7 +140,7 @@ public class CalendarAuth {
.build());
} else {
return authorize(g.getCredentialsId()).map(cred ->
new Calendar.Builder(HTTP_TRANSPORT, JSON_FACTORY, cred)
new Calendar.Builder(HTTP_TRANSPORTS.get(g.getCredentialsId()), JSON_FACTORY, cred)
.setApplicationName(APPLICATION_NAME)
.build());
}
@@ -143,7 +148,8 @@ public class CalendarAuth {
}
public static Mono<Calendar> getCalendarService(final int credentialId) {
return authorize(credentialId).map(cred -> new Calendar.Builder(HTTP_TRANSPORT, JSON_FACTORY, cred)
return authorize(credentialId).map(cred -> new Calendar
.Builder(HTTP_TRANSPORTS.get(credentialId), JSON_FACTORY, cred)
.setApplicationName(APPLICATION_NAME)
.build());
}

43
core/src/main/resources/logback.xml
View File

@@ -1,27 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true">
<logger name="org.springframework.web" level="INFO" />
<logger name="io.netty" level="INFO" />
<logger name="reactor" level="INFO" />
<logger name="proxy" level="INFO" />
<logger name="reactor.retry" level="DEBUG" />
<logger name="discord4j.core" level="DEBUG" />
<logger name="discord4j.gateway" level="INFO" />
<logger name="discord4j.gateway.client" level="DEBUG" />
<logger name="io.lettuce" level="INFO" />
<logger name="dev.miku.r2dbc.mysql" level="INFO" />
<logger name="org.springframework.web" level="INFO" />
<logger name="io.netty" level="INFO" />
<logger name="reactor" level="INFO" />
<logger name="proxy" level="INFO" />
<logger name="reactor.retry" level="DEBUG" />
<logger name="discord4j.core" level="DEBUG" />
<logger name="discord4j.gateway" level="INFO" />
<logger name="discord4j.gateway.client" level="INFO" />
<!--logger name="discord4j.rest.request.RequestStream" level="TRACE" /-->
<logger name="io.lettuce" level="INFO" />
<logger name="dev.miku.r2dbc.mysql" level="INFO" />
<turboFilter class="org.dreamexposure.discal.core.filter.GatewayEventFilter">
<Exclude>PRESENCE_UPDATE,GUILD_CREATE,GUILD_MEMBERS_CHUNK</Exclude>
</turboFilter>
<turboFilter class="org.dreamexposure.discal.core.filter.GatewayEventFilter">
<Exclude>PRESENCE_UPDATE,GUILD_CREATE,GUILD_MEMBERS_CHUNK</Exclude>
</turboFilter>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>
<root level="DEBUG">
<appender-ref ref="CONSOLE"/>
</root>
<root level="DEBUG">
<appender-ref ref="CONSOLE" />
</root>
</configuration>