mirror of
https://github.com/fankes/termux-app.git
synced 2025-09-06 10:45:23 +08:00
Prefix DEFAULT_LOG_TAG even when a tag is passed while logging
This commit is contained in:
@@ -30,15 +30,15 @@ public class Logger {
|
|||||||
|
|
||||||
static public void logMesssage(int logLevel, String tag, String message) {
|
static public void logMesssage(int logLevel, String tag, String message) {
|
||||||
if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
if(logLevel == Log.ERROR && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
||||||
Log.e(tag, message);
|
Log.e(getFullTag(tag), message);
|
||||||
else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
else if(logLevel == Log.WARN && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
||||||
Log.w(tag, message);
|
Log.w(getFullTag(tag), message);
|
||||||
else if(logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
else if(logLevel == Log.INFO && CURRENT_LOG_LEVEL >= LOG_LEVEL_NORMAL)
|
||||||
Log.i(tag, message);
|
Log.i(getFullTag(tag), message);
|
||||||
else if(logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
|
else if(logLevel == Log.DEBUG && CURRENT_LOG_LEVEL >= LOG_LEVEL_DEBUG)
|
||||||
Log.d(tag, message);
|
Log.d(getFullTag(tag), message);
|
||||||
else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
|
else if(logLevel == Log.VERBOSE && CURRENT_LOG_LEVEL >= LOG_LEVEL_VERBOSE)
|
||||||
Log.v(tag, message);
|
Log.v(getFullTag(tag), message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -133,9 +133,9 @@ public class Logger {
|
|||||||
e.printStackTrace(pw);
|
e.printStackTrace(pw);
|
||||||
pw.close();
|
pw.close();
|
||||||
if(message != null)
|
if(message != null)
|
||||||
Log.e(tag, message + ":\n" + errors.toString());
|
Log.e(getFullTag(tag), message + ":\n" + errors.toString());
|
||||||
else
|
else
|
||||||
Log.e(tag, errors.toString());
|
Log.e(getFullTag(tag), errors.toString());
|
||||||
errors.close();
|
errors.close();
|
||||||
} catch (IOException e1) {
|
} catch (IOException e1) {
|
||||||
e1.printStackTrace();
|
e1.printStackTrace();
|
||||||
@@ -220,4 +220,11 @@ public class Logger {
|
|||||||
return CURRENT_LOG_LEVEL;
|
return CURRENT_LOG_LEVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static public String getFullTag(String tag) {
|
||||||
|
if(DEFAULT_LOG_TAG.equals(tag))
|
||||||
|
return tag;
|
||||||
|
else
|
||||||
|
return DEFAULT_LOG_TAG + ":" + tag;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user