LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-31 04:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

logging locks fixed (unable to start app, etc.)

Browse Source
This commit is contained in:
Jindra Petřík
2015-12-05 13:25:12 +01:00
parent 8a874ab13a
commit 0391d0b22e
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/jpexs/decompiler/flash/gui/Main.java
View File

@@ -1771,6 +1771,14 @@ public class Main {
mainFrame.getPanel().unloadFlashPlayer();
mainFrame.dispose();
}
if (fileTxt != null) {
try {
fileTxt.flush();
fileTxt.close();
} catch (Exception ex) {
//ignore
}
}
System.exit(0);
}
@@ -1965,11 +1973,11 @@ public class Main {
oldFileTxt.close();
}
String fileName;
String fileName = null;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss");
try {
fileName = Configuration.getFFDecHome() + File.separator + "logs" + File.separator;
fileName = Configuration.getFFDecHome() + "logs" + File.separator;
if (Configuration.useDetailedLogging.get()) {
fileName += "log-" + sdf.format(new Date()) + ".txt";
} else {
@@ -1981,12 +1989,30 @@ public class Main {
}
fileTxt = new FileHandler(fileName);
} catch (IOException | SecurityException ex) {
logger.log(Level.SEVERE, null, ex);
//cannot get lock error
if (ex.getMessage().contains("lock for")) {
//remove all old log files and their .lck
for (int i = 0; i <= 100; i++) {
File flog = new File(fileName + (i == 0 ? "" : "." + i));
File flog_lock = new File(fileName + (i == 0 ? "" : "." + i) + ".lck");
flog.delete();
flog_lock.delete();
}
try {
fileTxt = new FileHandler(fileName);
} catch (IOException | SecurityException ex1) {
logger.log(Level.SEVERE, "Cannot initialize logging", ex);
}
} else {
logger.log(Level.SEVERE, "Cannot initialize logging", ex);
}
}
Formatter formatterTxt = new LogFormatter();
fileTxt.setFormatter(formatterTxt);
logger.addHandler(fileTxt);
if (fileTxt != null) {
fileTxt.setFormatter(formatterTxt);
logger.addHandler(fileTxt);
}
if (!GraphicsEnvironment.isHeadless() && ErrorLogFrame.hasInstance()) {
ErrorLogFrame.getInstance().clearErrorState();