From ef74db65aa26412f7221ef50c4a2ab867760869a Mon Sep 17 00:00:00 2001
From: noobie <noobie@goapunks.net>
Date: Mon, 13 Mar 2017 12:19:14 +0100
Subject: [PATCH] Make Tor boot more verbose
Signed-off-by: noobie <noobie@goapunks.net>
---
.../briarproject/bramble/plugin/tor/TorPlugin.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
index f0cf90e7c3..563f5fbe9b 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -193,8 +193,17 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
// Log the process's standard output until it detaches
if (LOG.isLoggable(INFO)) {
Scanner stdout = new Scanner(torProcess.getInputStream());
- while (stdout.hasNextLine()) LOG.info(stdout.nextLine());
+ Scanner stderr = new Scanner(torProcess.getErrorStream());
+ while (stdout.hasNextLine() || stderr.hasNextLine()){
+ if(stdout.hasNextLine()) {
+ LOG.info(stdout.nextLine());
+ }
+ if(stderr.hasNextLine()){
+ LOG.info(stderr.nextLine());
+ }
+ }
stdout.close();
+ stderr.close();
}
try {
// Wait for the process to detach or exit
--
GitLab