Display and control your Android device
Log to android logger and stdout/stderr
Romain Vimont6605ab8e23fb
diff --git a/server/src/com/genymobile/scrcpy/Ln.java b/server/src/com/genymobile/scrcpy/Ln.javanew file mode 100644index 00000000..8cf52860--- /dev/null+++ b/server/src/com/genymobile/scrcpy/Ln.java@@ -0,0 +1,37 @@+package com.genymobile.scrcpy;++import android.util.Log;++/**+ * Log both to Android logger (so that logs are visible in "adb logcat") and standard output/error (so that they are visible in the terminal+ * directly).+ */+public class Ln {++ private static final String TAG = "scrcpy";++ private Ln() {+ // not instantiable+ }++ public static void d(String message) {+ Log.d(TAG, message);+ System.out.println("DEBUG: " + message);+ }++ public static void i(String message) {+ Log.i(TAG, message);+ System.out.println("INFO: " + message);+ }++ public static void w(String message) {+ Log.w(TAG, message);+ System.out.println("WARN: " + message);+ }++ public static void e(String message, Throwable throwable) {+ Log.e(TAG, message, throwable);+ System.out.println("ERROR: " + message);+ throwable.printStackTrace();+ }+}diff --git a/server/src/com/genymobile/scrcpy/ScrCpyServer.java b/server/src/com/genymobile/scrcpy/ScrCpyServer.javaindex ff217771..045c1cd9 100644--- a/server/src/com/genymobile/scrcpy/ScrCpyServer.java+++ b/server/src/com/genymobile/scrcpy/ScrCpyServer.java@@ -4,6 +4,8 @@ import java.io.IOException;public class ScrCpyServer {+ private static final String TAG = "scrcpy";+public static void scrcpy() throws IOException {String deviceName = DeviceUtil.getDeviceName();ScreenInfo initialScreenInfo = DeviceUtil.getScreenInfo();@@ -13,8 +15,7 @@ public class ScrCpyServer {try {new ScreenStreamer(connection).streamScreen();} catch (IOException e) {- System.err.println("Screen streaming interrupted: " + e.getMessage());- System.err.flush();+ Ln.e("Screen streaming interrupted", e);}}}