Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-27 00:45:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix mailbox msg remove bug, add setup for release version

Browse source
This commit is contained in:
Manfred Karrer 2015-11-18 13:46:47 +01:00
parent 9b1108aa0a
commit 82e766e6b1
38 changed files with 333 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/src/main/java/io/bitsquare/app/Log.java
View file

@ -17,6 +17,8 @@
package io.bitsquare.app;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
@ -26,8 +28,11 @@ import org.slf4j.LoggerFactory;
public class Log {
public static boolean PRINT_TRACE_METHOD = true;
private static SizeBasedTriggeringPolicy triggeringPolicy;
private static Logger logbackLogger;
public static void setup(String fileName) {
public static void setup(String fileName, boolean releaseVersion) {
Log.PRINT_TRACE_METHOD = !releaseVersion;
LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
RollingFileAppender appender = new RollingFileAppender();
@ -42,13 +47,13 @@ public class Log {
rollingPolicy.setMaxIndex(10);
rollingPolicy.start();
SizeBasedTriggeringPolicy triggeringPolicy = new ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy();
triggeringPolicy.setMaxFileSize("1MB");
triggeringPolicy = new SizeBasedTriggeringPolicy();
triggeringPolicy.setMaxFileSize(releaseVersion ? "1MB" : "50MB");
triggeringPolicy.start();
PatternLayoutEncoder encoder = new PatternLayoutEncoder();
encoder.setContext(loggerContext);
encoder.setPattern("%highlight(%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg %xEx%n)");
encoder.setPattern("%highlight(%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15} - %msg %xEx%n)");
encoder.start();
appender.setEncoder(encoder);
@ -56,7 +61,8 @@ public class Log {
appender.setTriggeringPolicy(triggeringPolicy);
appender.start();
ch.qos.logback.classic.Logger logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
logbackLogger.setLevel(releaseVersion ? Level.INFO : Level.TRACE);
logbackLogger.addAppender(appender);
}
@ -77,4 +83,6 @@ public class Log {
String className = stackTraceElement.getClassName();
LoggerFactory.getLogger(className).trace("Called: {} [{}]", methodName, message);
}
}

4
common/src/main/java/io/bitsquare/common/crypto/PubKeyRing.java
View file

@ -99,8 +99,8 @@ public class PubKeyRing implements Serializable {
@Override
public String toString() {
return "PubKeyRing{" +
"\n\nsignaturePubKey.hashCode()=\n" + signaturePubKey.hashCode() +
"\n\nencryptionPubKey.hashCode()=\n" + encryptionPubKey.hashCode() +
"signaturePubKey.hashCode()=\n" + signaturePubKey.hashCode() +
"encryptionPubKey.hashCode()=\n" + encryptionPubKey.hashCode() +
'}';
}

2
common/src/main/java/io/bitsquare/storage/FileManager.java
View file

@ -218,7 +218,7 @@ public class FileManager<T> {
private void saveNowInternal(T serializable) {
long now = System.currentTimeMillis();
saveToFile(serializable, dir, storageFile);
UserThread.execute(() -> log.info("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now));
UserThread.execute(() -> log.trace("Save {} completed in {}msec", storageFile, System.currentTimeMillis() - now));
}
private synchronized void saveToFile(T serializable, File dir, File storageFile) {