Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean up startup logs #291

Merged
merged 1 commit into from
Sep 15, 2023
Merged

clean up startup logs #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions common/src/main/java/net/draycia/carbon/common/CarbonChatInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@
import net.draycia.carbon.common.util.CloudUtils;
import net.draycia.carbon.common.util.ConcurrentUtil;
import net.draycia.carbon.common.util.UpdateChecker;
import ninja.egg82.messenger.services.PacketService;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.framework.qual.DefaultQualifier;

@DefaultQualifier(NonNull.class)
Expand Down Expand Up @@ -172,10 +170,6 @@ public CarbonChannelRegistry channelRegistry() {
return this.channelRegistry;
}

public @Nullable PacketService packetService() {
return this.messagingManager.get().packetService();
}

public boolean isProxy() {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/net/draycia/carbon/common/CarbonCommonModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public UserManagerInternal<CarbonPlayerCommon> userManager(
final Logger logger,
final Injector injector
) throws IOException {
logger.info("Initializing " + configManager.primaryConfig().storageType() + " storage manager.");
logger.info("Initializing " + configManager.primaryConfig().storageType() + " storage manager...");

return switch (configManager.primaryConfig().storageType()) {
case MYSQL -> injector.getInstance(DatabaseUserManager.Factory.class).create(
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/net/draycia/carbon/common/channels/CarbonChannelRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ public void loadConfigChannels(final CarbonMessages messages) {
}

private void loadConfigChannels_(final CarbonMessages messages) {
this.logger.info("Loading config channels...");
this.defaultKey = this.configManager.primaryConfig().defaultChannel();

List<Path> channelConfigs = FileUtil.listDirectoryEntries(this.configChannelDir, "*.conf");
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/net/draycia/carbon/common/config/ConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ private ConfigManager(
}

public void reloadPrimaryConfig() {
this.logger.info("Reloading configuration....");
final @Nullable PrimaryConfig load = this.load(PrimaryConfig.class, PRIMARY_CONFIG_FILE_NAME);
if (load != null) {
this.primaryConfig = load;
Expand All @@ -82,6 +83,7 @@ public PrimaryConfig primaryConfig() {
if (this.primaryConfig == null) {
synchronized (this) {
if (this.primaryConfig == null) {
this.logger.info("Loading configuration....");
final @Nullable PrimaryConfig load = this.load(PrimaryConfig.class, PRIMARY_CONFIG_FILE_NAME);
if (load == null) {
throw new RuntimeException("Failed to initialize primary config, see above for further details");
Expand Down
5 changes: 3 additions & 2 deletions common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ private void reloadTranslations() throws IOException {
});
}

this.logger.info("Loaded {} locales: [{}]", map.size(), map.keySet().stream().map(Locale::toString).collect(Collectors.joining(", ")));
this.locales = Map.copyOf(map);
}

Expand All @@ -164,7 +165,7 @@ private void tryLoadLocale(final Map<Locale, Properties> map, final Path localeD
}

private @Nullable Properties readLocale(final Path localeDirectory, final Path localeFile, final Locale locale) {
this.logger.info("Found locale {} ({}) in: {}", locale.getDisplayName(), locale, localeFile);
this.logger.debug("Found locale {} ({}) in: {}", locale.getDisplayName(), locale, localeFile);

final Properties properties = new Properties() {
@Override
Expand All @@ -180,7 +181,7 @@ public synchronized Set<Map.Entry<Object, Object>> entrySet() {
try {
this.loadProperties(properties, localeDirectory, localeFile);

this.logger.info("Successfully loaded locale {} ({})", locale.getDisplayName(), locale);
this.logger.debug("Successfully loaded locale {} ({})", locale.getDisplayName(), locale);
return properties;
} catch (final IOException ex) {
this.logger.warn("Unable to load locale {} ({}) from source: {}", locale.getDisplayName(), locale, localeFile, ex);
Expand Down
48 changes: 48 additions & 0 deletions common/src/main/java/net/draycia/carbon/common/users/db/DatabaseUserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.framework.qual.DefaultQualifier;
import org.flywaydb.core.Flyway;
import org.flywaydb.core.api.logging.Log;
import org.flywaydb.core.api.logging.LogCreator;
import org.flywaydb.core.api.logging.LogFactory;
import org.jdbi.v3.core.Jdbi;
import org.jdbi.v3.core.statement.PreparedBatch;
import org.jdbi.v3.core.statement.Update;
Expand Down Expand Up @@ -236,8 +239,11 @@ public DatabaseUserManager create(final String migrationsLocation, final Consume
.validateOnMigrate(true)
.load();

LogFactory.setLogCreator(new CarbonLogCreator(this.logger));
this.logger.info("Executing Flyway database migrations...");
flyway.repair();
flyway.migrate();
LogFactory.setLogCreator(null);

final Jdbi jdbi = Jdbi.create(dataSource)
.registerArgument(new ComponentArgumentFactory())
Expand All @@ -264,4 +270,46 @@ public DatabaseUserManager create(final String migrationsLocation, final Consume

}

private record CarbonLogCreator(Logger logger) implements LogCreator {
public Log createLogger(final Class<?> clazz) {
final Logger l = this.logger;
return new Log() {
@Override
public boolean isDebugEnabled() {
return true;
}

@Override
public void debug(final String message) {
l.debug(" [{}] {}", clazz.getSimpleName(), message);
}

@Override
public void info(final String message) {
l.info(" [{}] {}", clazz.getSimpleName(), message);
}

@Override
public void warn(final String message) {
l.warn(" [{}] {}", clazz.getSimpleName(), message);
}

@Override
public void error(final String message) {
l.error(" [{}] {}", clazz.getSimpleName(), message);
}

@Override
public void error(final String message, final Exception e) {
l.error(" [{}] {}", clazz.getSimpleName(), message, e);
}

@Override
public void notice(final String message) {
l.info(" [{}] (Notice) {}", clazz.getSimpleName(), message);
}
};
}
}

}
2 changes: 1 addition & 1 deletion fabric/src/main/java/net/draycia/carbon/fabric/CarbonChatFabric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ private CarbonChatFabric(
final @PeriodicTasks ScheduledExecutorService periodicTasks,
final ProfileCache profileCache,
final ProfileResolver profileResolver,
final CarbonMessages carbonMessages,
final PlatformUserManager userManager,
final ExecutionCoordinatorHolder commandExecutor,
final CarbonServer carbonServer,
final CarbonMessages carbonMessages,
final CarbonEventHandler eventHandler,
final CarbonChannelRegistry channelRegistry,
final Provider<MessagingManager> messagingManagerProvider,
Expand Down
1 change: 0 additions & 1 deletion paper/src/main/java/net/draycia/carbon/paper/CarbonChatPaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ private CarbonChatPaper(

void onEnable() {
this.init();
this.packetService();

for (final Class<? extends Listener> listenerClass : LISTENER_CLASSES) {
this.plugin.getServer().getPluginManager().registerEvents(
Expand Down
3 changes: 1 addition & 2 deletions velocity/src/main/java/net/draycia/carbon/velocity/CarbonChatVelocity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public CarbonChatVelocity(
final ProfileCache profileCache,
final ProfileResolver profileResolver,
final ExecutionCoordinatorHolder commandExecutor,
final CarbonMessages carbonMessages,
final PlatformUserManager userManager,
final CarbonServerVelocity carbonServer,
final CarbonMessages carbonMessages,
final CarbonEventHandler eventHandler,
final CarbonChannelRegistry channelRegistry,
final Provider<MessagingManager> messagingManager
Expand All @@ -95,7 +95,6 @@ public CarbonChatVelocity(

public void onInitialization(final CarbonVelocityBootstrap carbonVelocityBootstrap) {
this.init();
this.packetService();

for (final Class<? extends VelocityListener<?>> clazz : LISTENER_CLASSES) {
this.injector().getInstance(clazz).register(this.proxyServer.getEventManager(), carbonVelocityBootstrap);
Expand Down