diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java b/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java index f2dbfd77..abf8c103 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/LogcatHandler.java @@ -7,6 +7,12 @@ import java.util.logging.LogRecord; public class LogcatHandler extends Handler { + public LogcatHandler(String tag) { + mTag = tag; + } + + private String mTag = null; + private static final int TAG_MAX_LENGTH = 23; static String getLevelName(int level) { @@ -75,9 +81,9 @@ public class LogcatHandler extends Handler { int level = levelFromLevel(record.getLevel()); - Log.println(level, tag, record.getMessage()); + Log.println(level, mTag, record.getMessage()); if (record.getThrown() != null) { - Log.println(level, tag, Log.getStackTraceString(record.getThrown())); + Log.println(level, mTag, Log.getStackTraceString(record.getThrown())); } } diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 49a56bc0..7b790e7b 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -56,7 +56,7 @@ public class MpMasterService extends Service { System.loadLibrary("mpmaster"); } - public static final String TAG = "MpMaster"; + public static final String TAG = "MPMST"; public Logger logger; @@ -134,7 +134,7 @@ public class MpMasterService extends Service { LogFormatter logFormatter = new LogFormatter(); if (BuildConfig.DEBUG) { - LogcatHandler logcatHandler = new LogcatHandler(); + LogcatHandler logcatHandler = new LogcatHandler(TAG); logcatHandler.setFormatter(logFormatter); logger.addHandler(logcatHandler); } @@ -254,7 +254,7 @@ public class MpMasterService extends Service { mMntnMode = masterConfig.mntnMode != 0; mQuickHbMode = masterConfig.quickHbMode != 0; mUsingAbsHbTime = masterConfig.usingAbsHbTime != 0; - mHeartbeatDuration = masterConfig.heartbeat * 10; // minute to second + mHeartbeatDuration = masterConfig.heartbeat * 60; // minute to second mAbsHeartbeatTimes = masterConfig.absHeartbeats; mSeparateNetwork = masterConfig.separateNetwork != 0; mTimeOfMpAppAlive = masterConfig.mpappMonitorTimeout;