I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

only use instance reference to logger in static context

Browse Source
This commit is contained in:
idk
2023-02-12 19:05:56 +00:00
parent 298c87f457
commit 922ec66f95
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/net/i2p/router/WinLauncher.java
View File

@@ -47,18 +47,18 @@ public class WinLauncher extends CopyConfigDir {
for (String arg : args) { for (String arg : args) {
if (arg.equals("-private")) { if (arg.equals("-private")) {
privateBrowsing = 1; privateBrowsing = 1;
logger.info( launcher.logger.info(
"Private browsing is true, profile will be discarded at end of session."); "Private browsing is true, profile will be discarded at end of session.");
} else if (arg.equals("-chromium")) { } else if (arg.equals("-chromium")) {
chromiumFirst = true; chromiumFirst = true;
logger.info("Chromium will be selected before Firefox."); launcher.logger.info("Chromium will be selected before Firefox.");
} else if (arg.equals("-usability")) { } else if (arg.equals("-usability")) {
usabilityMode = true; usabilityMode = true;
logger.info( launcher.logger.info(
"Usability mode is true, using alternate extensions loadout."); "Usability mode is true, using alternate extensions loadout.");
} else if (arg.equals("-noproxycheck")) { } else if (arg.equals("-noproxycheck")) {
proxyTimeoutTime = 0; proxyTimeoutTime = 0;
logger.info("Proxy timeout time set to zero"); launcher.logger.info("Proxy timeout time set to zero");
} else { } else {
// make an effort to not let people launch into sites if the proxy // make an effort to not let people launch into sites if the proxy
// isn't quite ready yet, but also disable the proxy timeout if // isn't quite ready yet, but also disable the proxy timeout if
@@ -101,26 +101,26 @@ public class WinLauncher extends CopyConfigDir {
* to find the JVM and Runtime bundle. This broke Windows 11 installs. * to find the JVM and Runtime bundle. This broke Windows 11 installs.
*/ */
System.setProperty("user.dir", programs.getAbsolutePath()); System.setProperty("user.dir", programs.getAbsolutePath());
logger.info("\t" + System.getProperty("user.dir")); launcher.logger.info("\t" + System.getProperty("user.dir"));
logger.info("\t" + System.getProperty("i2p.dir.base")); launcher.logger.info("\t" + System.getProperty("i2p.dir.base"));
logger.info("\t" + System.getProperty("i2p.dir.config")); launcher.logger.info("\t" + System.getProperty("i2p.dir.config"));
logger.info("\t" + System.getProperty("router.pid")); launcher.logger.info("\t" + System.getProperty("router.pid"));
boolean continuerunning = promptServiceStartIfAvailable("i2p"); boolean continuerunning = promptServiceStartIfAvailable("i2p");
if (!continuerunning) { if (!continuerunning) {
logger.severe( launcher.logger.severe(
"Service startup failure, please start I2P service with services.msc"); "Service startup failure, please start I2P service with services.msc");
System.exit(2); System.exit(2);
} }
continuerunning = promptUserInstallStartIfAvailable(); continuerunning = promptUserInstallStartIfAvailable();
if (!continuerunning) { if (!continuerunning) {
logger.severe("User-install startup required."); launcher.logger.severe("User-install startup required.");
System.exit(2); System.exit(2);
} }
// This actually does most of what we use NSIS for if NSIS hasn't // This actually does most of what we use NSIS for if NSIS hasn't
// already done it, which essentially makes this whole thing portable. // already done it, which essentially makes this whole thing portable.
if (!copyConfigDir()) { if (!copyConfigDir()) {
logger.severe("Cannot copy the configuration directory"); launcher.logger.severe("Cannot copy the configuration directory");
System.exit(1); System.exit(1);
} }
@@ -131,14 +131,15 @@ public class WinLauncher extends CopyConfigDir {
launcher.i2pRouter = new Router(routerConfig(), System.getProperties()); launcher.i2pRouter = new Router(routerConfig(), System.getProperties());
if (!isInstalled("i2p")) { if (!isInstalled("i2p")) {
if (launcher.i2pRouter.saveConfig("routerconsole.browser", null)) { if (launcher.i2pRouter.saveConfig("routerconsole.browser", null)) {
logger.info("removed routerconsole.browser config"); launcher.logger.info("removed routerconsole.browser config");
} }
if (launcher.i2pRouter.saveConfig("routerconsole.browser", if (launcher.i2pRouter.saveConfig("routerconsole.browser",
appImageExe() + " -noproxycheck")) { appImageExe() + " -noproxycheck")) {
logger.info("updated routerconsole.browser config " + appImageExe()); launcher.logger.info("updated routerconsole.browser config " +
appImageExe());
} }
} }
logger.info("Router is configured"); launcher.logger.info("Router is configured");
Thread registrationThread = new Thread(launcher.REGISTER_UPP); Thread registrationThread = new Thread(launcher.REGISTER_UPP);
registrationThread.setName("UPP Registration"); registrationThread.setName("UPP Registration");