nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00
Code Releases Activity

Real time logging for syncthing binary.

Browse source
This commit is contained in:
Felix Ableitner 2014-05-28 21:16:12 +02:00
parent 51309ef984
commit 66cf333725
1 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
View file

@ -32,6 +32,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.concurrent.locks.ReentrantLock;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
@ -74,6 +75,10 @@ public class SyncthingService extends Service {
private RestApi mApi; private RestApi mApi;
private final ReentrantLock mNativeLogLock = new ReentrantLock();
private String mNativeLog = "";
private final SyncthingServiceBinder mBinder = new SyncthingServiceBinder(this); private final SyncthingServiceBinder mBinder = new SyncthingServiceBinder(this);
/** /**
@ -117,12 +122,11 @@ public class SyncthingService extends Service {
*/ */
private void runNative() { private void runNative() {
DataOutputStream dos = null; DataOutputStream dos = null;
InputStreamReader isr = null;
int ret = 1; int ret = 1;
String log = ""; Process process = null;
try { try {
Process p = Runtime.getRuntime().exec("sh"); process = Runtime.getRuntime().exec("sh");
dos = new DataOutputStream(p.getOutputStream()); dos = new DataOutputStream(process.getOutputStream());
// Set home directory to data folder for syncthing to use. // Set home directory to data folder for syncthing to use.
dos.writeBytes("HOME=" + getApplicationInfo().dataDir + "\n"); dos.writeBytes("HOME=" + getApplicationInfo().dataDir + "\n");
// Call syncthing with -home (as it would otherwise use "~/.config/syncthing/". // Call syncthing with -home (as it would otherwise use "~/.config/syncthing/".
@ -131,23 +135,10 @@ public class SyncthingService extends Service {
dos.writeBytes("exit\n"); dos.writeBytes("exit\n");
dos.flush(); dos.flush();
ret = p.waitFor(); log(process.getInputStream(), Log.INFO);
log(process.getErrorStream(), Log.WARN);
// Write syncthing binary output to log. ret = process.waitFor();
// NOTE: This is only done on shutdown, not live.
isr = new InputStreamReader(p.getInputStream());
BufferedReader stdout = new BufferedReader(isr);
String line;
while((line = stdout.readLine()) != null) {
log += "stderr: " + line + "\n";
Log.w(TAG, "stderr: " + line);
}
isr = new InputStreamReader(p.getErrorStream());
BufferedReader stderr = new BufferedReader(isr);
while((line = stderr.readLine()) != null) {
log += "stdout: " + line + "\n";
Log.i(TAG, "stdout: " + line);
}
} }
catch(IOException e) { catch(IOException e) {
Log.e(TAG, "Failed to execute syncthing binary or read output", e); Log.e(TAG, "Failed to execute syncthing binary or read output", e);
@ -156,20 +147,44 @@ public class SyncthingService extends Service {
Log.e(TAG, "Failed to execute syncthing binary or read output", e); Log.e(TAG, "Failed to execute syncthing binary or read output", e);
} }
finally { finally {
process.destroy();
if (ret != 0) { if (ret != 0) {
stopSelf(); stopSelf();
// Include the log for Play Store crash reports. // Include the log for Play Store crash reports.
throw new NativeExecutionException("Syncthing binary returned error code " + throw new NativeExecutionException("Syncthing binary returned error code " +
Integer.toString(ret), log); Integer.toString(ret), mNativeLog);
} }
}
}
/**
* Logs the outputs of a stream to logcat and mNativeLog.
*
* @param is The stream to log.
* @param priority The log level, eg Log.INFO or Log.WARN.
*/
private void log(final InputStream is, final int priority) {
new Thread(new Runnable() {
@Override
public void run() {
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
String line;
try { try {
dos.close(); while ((line = br.readLine()) != null) {
isr.close(); mNativeLogLock.lock();
Log.println(priority, TAG, ": " + line);
mNativeLog += line + "\n";
mNativeLogLock.unlock();
}
} }
catch (IOException e) { catch (IOException e) {
Log.w(TAG, "Failed to close stream", e); // NOTE: This is sometimes called on shutdown, as
// Process.destroy() closes the stream.
Log.w(TAG, "Failed to read syncthing command line output", e);
} }
} }
}).start();
} }
/** /**
@ -219,6 +234,7 @@ public class SyncthingService extends Service {
* Creates notification, starts native binary. * Creates notification, starts native binary.
*/ */
@Override @Override
public void onCreate() { public void onCreate() {
PendingIntent pi = PendingIntent.getActivity( PendingIntent pi = PendingIntent.getActivity(
this, 0, new Intent(this, WebGuiActivity.class), this, 0, new Intent(this, WebGuiActivity.class),