ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

sentry: Fix logging

Browse Source
This commit is contained in:
Owain van Brakel
2020-03-13 12:15:07 +01:00
parent b6b1ae3659
commit 6987d28538
7 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/RuneLite.java
View File

@@ -62,6 +62,7 @@ import net.runelite.client.callback.Hooks;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.chat.CommandManager;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.config.OpenOSRSConfig;
import net.runelite.client.discord.DiscordService;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.ExternalPluginsLoaded;
@@ -122,6 +123,7 @@ public class RuneLite
@Inject
private WorldService worldService;
@Inject
private PluginManager pluginManager;
@@ -201,6 +203,9 @@ public class RuneLite
@Nullable
private Client client;
@Inject
private OpenOSRSConfig openOSRSConfig;
@Inject
private Provider<ModelOutlineRenderer> modelOutlineRenderer;
@@ -305,7 +310,7 @@ public class RuneLite
System.setProperty("cli.world", String.valueOf(world));
}
SentryClient client = Sentry.init("https://fa31d674e44247fa93966c69a903770f@sentry.io/1811856");
SentryClient client = Sentry.init();
client.setRelease(RuneLiteProperties.getPlusVersion());
final ClientLoader clientLoader = new ClientLoader(options.valueOf(updateMode));
@@ -366,6 +371,12 @@ public class RuneLite
injector.injectMembers(client);
}
if (RuneLiteProperties.getLauncherVersion() == null || !openOSRSConfig.shareLogs())
{
final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
logger.detachAppender("Sentry");
}
// Load user configuration
RuneLiteSplashScreen.stage(.57, "Loading user config");
configManager.load();

11
runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java
View File

@@ -8,7 +8,6 @@ import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.functions.Consumer;
import io.sentry.Sentry;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -17,7 +16,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.events.Event;
import net.runelite.client.RuneLiteProperties;
import net.runelite.client.config.OpenOSRSConfig;
@Slf4j
@@ -91,14 +89,7 @@ public class EventBus implements EventBusInterface
.compose(applyScheduler(subscribe, true))
.compose(applyScheduler(observe, false))
.subscribe(action, error ->
{
log.error("Exception in eventbus", error);
if (RuneLiteProperties.getLauncherVersion() != null && openOSRSConfig.shareLogs())
{
Sentry.capture(error);
}
});
log.error("Exception in eventbus", error));
getCompositeDisposable(lifecycle).add(disposable);
subscriptionList.put(lifecycle, eventClass);

8
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
View File

@@ -26,6 +26,7 @@
*/
package net.runelite.client.plugins.openosrs;
import ch.qos.logback.classic.Logger;
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
@@ -50,6 +51,7 @@ import net.runelite.client.ui.ClientToolbar;
import net.runelite.client.ui.NavigationButton;
import net.runelite.client.util.HotkeyListener;
import net.runelite.client.util.ImageUtil;
import org.slf4j.LoggerFactory;
@PluginDescriptor(
loadWhenOutdated = true, // prevent users from disabling
@@ -146,6 +148,12 @@ public class OpenOSRSPlugin extends Plugin
expectInput = false;
keyManager.unregisterKeyListener(keyListener);
}
if (event.getKey().equals("shareLogs") && !config.shareLogs())
{
final Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
logger.detachAppender("Sentry");
}
}
@Subscribe