diff --git a/java/net/i2p/router/CopyConfigDir.java b/java/net/i2p/router/CopyConfigDir.java index 35b2da7..7e049c7 100644 --- a/java/net/i2p/router/CopyConfigDir.java +++ b/java/net/i2p/router/CopyConfigDir.java @@ -12,7 +12,7 @@ import java.util.logging.FileHandler; import java.util.logging.SimpleFormatter; import net.i2p.util.Log; -public class CopyConfigDir extends WindowsServiceUtil { +public class CopyConfigDir extends WindowsAppUtil { final Log logger; public CopyConfigDir(RouterContext ctx) { diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java index 9452d86..f11d29c 100644 --- a/java/net/i2p/router/WinLauncher.java +++ b/java/net/i2p/router/WinLauncher.java @@ -24,11 +24,11 @@ import net.i2p.util.Log; * appdata * router.pid - the pid of the java process. */ -public class WinLauncher extends WindowsServiceUtil { +public class WinLauncher extends WindowsAppUtil { private final CopyConfigDir copyConfigDir; WindowsUpdatePostProcessor wupp = null; private final Router i2pRouter; - final Log logger; + private final Log logger; public WinLauncher() { i2pRouter = new Router(routerConfig(), System.getProperties()); copyConfigDir = new CopyConfigDir(i2pRouter.getContext()); @@ -115,7 +115,7 @@ public class WinLauncher extends WindowsServiceUtil { // This actually does most of what we use NSIS for if NSIS hasn't // already done it, which essentially makes this whole thing portable. - if (!launcher.copyConfigDir()) { + if (!launcher.copyConfigDir.copyConfigDir()) { launcher.logger.error("Cannot copy the configuration directory"); System.exit(1); } @@ -188,15 +188,6 @@ public class WinLauncher extends WindowsServiceUtil { return portFree; } - private void setNotStarting() { - logger.info("removing startup file, the application has started"); - File home = selectHome(); - File starting = new File(home, "starting"); - if (starting.exists()) { - starting.delete(); - } - } - private final Runnable REGISTER_UPP = () -> { RouterContext ctx; while ((ctx = i2pRouter.getContext()) == null) { diff --git a/java/net/i2p/router/WindowsAppUtil.java b/java/net/i2p/router/WindowsAppUtil.java index 5d609e6..c20a116 100644 --- a/java/net/i2p/router/WindowsAppUtil.java +++ b/java/net/i2p/router/WindowsAppUtil.java @@ -4,11 +4,6 @@ import java.io.File; import net.i2p.util.Log; public class WindowsAppUtil extends WindowsServiceUtil { - final Log logger; - public WindowsAppUtil(RouterContext ctx) { - super(); - logger = ctx.logManager().getLog(WindowsAppUtil.class); - } protected File selectHome() { // throws Exception { String path_override = System.getenv("I2P_CONFIG"); if (path_override != null) { @@ -21,7 +16,6 @@ public class WindowsAppUtil extends WindowsServiceUtil { } } File i2p = appImageHome(); - logger.info("Checking for signs of life in I2P_CONFIG directory: " + i2p); return i2p; } @@ -37,7 +31,6 @@ public class WindowsAppUtil extends WindowsServiceUtil { } } File i2p = appImageHome(); - logger.info("Checking for signs of life in I2P directory: " + i2p); return i2p; }