Skip to content

Fix exception when moving installation #200

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix exception when moving installation #200

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
39 changes: 28 additions & 11 deletions src/main/java/net/technicpack/launcher/LauncherMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import net.technicpack.launcher.ui.components.discover.DiscoverInfoPanel;
import net.technicpack.launcher.ui.components.modpacks.ModpackSelector;
import net.technicpack.launchercore.TechnicConstants;
import net.technicpack.launchercore.auth.IUserStore;
import net.technicpack.launchercore.auth.IUserType;
import net.technicpack.launchercore.auth.UserModel;
import net.technicpack.launchercore.exception.DownloadException;
Expand Down Expand Up @@ -136,6 +135,7 @@ public class LauncherMain {
};

private static IBuildNumber buildNumber;
private static RotatingFileHandler currentFileHandler;

public static void main(String[] argv) {
try {
Expand Down Expand Up @@ -218,19 +218,13 @@ public static void main(String[] argv) {
private static void setupLogging(LauncherDirectories directories, ResourceLoader resources) {
System.out.println("Setting up logging");
final Logger logger = Utils.getLogger();
File logDirectory = new File(directories.getLauncherDirectory(), "logs");
if (!logDirectory.exists()) {
logDirectory.mkdir();
}
File logs = new File(logDirectory, "techniclauncher_%D.log");
RotatingFileHandler fileHandler = new RotatingFileHandler(logs.getPath());

fileHandler.setFormatter(new BuildLogFormatter(buildNumber.getBuildNumber()));
setupLogFile(directories);

for (Handler h : logger.getHandlers()) {
logger.removeHandler(h);
if(h != currentFileHandler) {
logger.removeHandler(h);
}
}
logger.addHandler(fileHandler);
logger.setUseParentHandlers(false);

LauncherMain.consoleFrame = new ConsoleFrame(2500, resources.getImage("icon.png"));
Expand All @@ -247,6 +241,29 @@ private static void setupLogging(LauncherDirectories directories, ResourceLoader
});
}

public static void setupLogFile(LauncherDirectories directories) {
final Logger logger = Utils.getLogger();
File logDirectory = new File(directories.getLauncherDirectory(), "logs");
if (!logDirectory.exists()) {
logDirectory.mkdir();
}
File logs = new File(logDirectory, "techniclauncher_%D.log");
RotatingFileHandler fileHandler = new RotatingFileHandler(logs.getPath());

fileHandler.setFormatter(new BuildLogFormatter(buildNumber.getBuildNumber()));

logger.addHandler(fileHandler);
if(currentFileHandler != null) {
logger.removeHandler(currentFileHandler);
try {
currentFileHandler.close();
} catch(SecurityException ex) {
logger.log(Level.WARNING, "Closing old log file failed: ", ex);
}
}
currentFileHandler = fileHandler;
}

private static void runStartupDebug() {
// Startup debug messages
Utils.getLogger().info("OS: " + System.getProperty("os.name").toLowerCase(Locale.ENGLISH));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/technicpack/launcher/ui/InstallerFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,11 @@ public void run() {
newRoot.mkdirs();

FileUtils.copyDirectory(oldRoot, newRoot);
LauncherMain.setupLogFile(new TechnicLauncherDirectories(newRoot));
Utils.getLogger().info("Log file location changed");
FileUtils.deleteDirectory(oldRoot);
} catch (IOException ex) {
Utils.getLogger().log(Level.SEVERE, "Copying install to new directory failed: ",ex);
Utils.getLogger().log(Level.SEVERE, "Copying install to new directory failed: ", ex);
}
}

Expand Down