Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Print server logs and newline in one call

Browse source 
System.out.println() first prints the message, then the new line.
Between these two calls, the client might print a message, breaking
formatting.

Instead, call System.out.print() with '\n' appended to the message.
This commit is contained in:
Romain Vimont 2023-03-08 20:07:03 +01:00
parent 7da45c246e
commit bb56472d4e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/src/main/java/com/genymobile/scrcpy/Ln.java
View file

@ -39,28 +39,28 @@ public final class Ln {
public static void v(String message) { public static void v(String message) {
if (isEnabled(Level.VERBOSE)) { if (isEnabled(Level.VERBOSE)) {
Log.v(TAG, message); Log.v(TAG, message);
System.out.println(PREFIX + "VERBOSE: " + message); System.out.print(PREFIX + "VERBOSE: " + message + '\n');
} }
} }
public static void d(String message) { public static void d(String message) {
if (isEnabled(Level.DEBUG)) { if (isEnabled(Level.DEBUG)) {
Log.d(TAG, message); Log.d(TAG, message);
System.out.println(PREFIX + "DEBUG: " + message); System.out.print(PREFIX + "DEBUG: " + message + '\n');
} }
} }
public static void i(String message) { public static void i(String message) {
if (isEnabled(Level.INFO)) { if (isEnabled(Level.INFO)) {
Log.i(TAG, message); Log.i(TAG, message);
System.out.println(PREFIX + "INFO: " + message); System.out.print(PREFIX + "INFO: " + message + '\n');
} }
} }
public static void w(String message, Throwable throwable) { public static void w(String message, Throwable throwable) {
if (isEnabled(Level.WARN)) { if (isEnabled(Level.WARN)) {
Log.w(TAG, message, throwable); Log.w(TAG, message, throwable);
System.out.println(PREFIX + "WARN: " + message); System.out.print(PREFIX + "WARN: " + message + '\n');
if (throwable != null) { if (throwable != null) {
throwable.printStackTrace(); throwable.printStackTrace();
} }
@ -74,7 +74,7 @@ public final class Ln {
public static void e(String message, Throwable throwable) { public static void e(String message, Throwable throwable) {
if (isEnabled(Level.ERROR)) { if (isEnabled(Level.ERROR)) {
Log.e(TAG, message, throwable); Log.e(TAG, message, throwable);
System.out.println(PREFIX + "ERROR: " + message); System.out.print(PREFIX + "ERROR: " + message + "\n");
if (throwable != null) { if (throwable != null) {
throwable.printStackTrace(); throwable.printStackTrace();
} }