Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
f721b57e
Commit
f721b57e
authored
May 17, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine GuardedProcess to include stderr output
parent
3a785ab7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
mobile/src/main/scala/com/github/shadowsocks/GuardedProcess.scala
...rc/main/scala/com/github/shadowsocks/GuardedProcess.scala
+4
-4
No files found.
mobile/src/main/scala/com/github/shadowsocks/GuardedProcess.scala
View file @
f721b57e
...
...
@@ -33,9 +33,9 @@ import com.github.shadowsocks.ShadowsocksApplication.app
import
scala.collection.JavaConversions._
import
scala.collection.immutable.Stream
class
StreamLogger
(
is
:
InputStream
,
tag
:
String
)
extends
Thread
{
class
StreamLogger
(
is
:
InputStream
,
tag
:
String
,
logger
:
(
String
,
String
)
=>
Int
)
extends
Thread
{
override
def
run
()
:
Unit
=
autoClose
(
new
BufferedReader
(
new
InputStreamReader
(
is
)))(
br
=>
try
Stream
.
continually
(
br
.
readLine
()).
takeWhile
(
_
!=
null
).
foreach
(
Log
.
i
(
tag
,
_
))
catch
{
try
Stream
.
continually
(
br
.
readLine
()).
takeWhile
(
_
!=
null
).
foreach
(
logger
(
tag
,
_
))
catch
{
case
_:
IOException
=>
})
}
...
...
@@ -68,8 +68,8 @@ class GuardedProcess(cmd: String*) {
.
directory
(
app
.
getFilesDir
)
.
start
()
val
is
=
process
.
getInputStream
new
StreamLogger
(
is
,
TAG
).
start
()
new
StreamLogger
(
process
.
getInputStream
(),
TAG
,
Log
.
i
).
start
()
new
StreamLogger
(
process
.
getErrorStream
(),
TAG
,
Log
.
e
).
start
()
if
(
callback
==
null
)
callback
=
onRestartCallback
else
callback
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment