Skip to content

Fixing the stopADBlog #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SrinivasanTarget merged 1 commit into from
Jan 19, 2018
Merged

Fixing the stopADBlog #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/com/thoughtworks/android/AndroidManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,17 @@ public String startADBLogWithPackage(String udid, String packageName, String fil
process = cmd.execForProcessToExecute("adb -s " + udid
+ " logcat | grep -F \"`adb shell ps | grep " + packageName + " | cut -c10-15`\"" + " > " + filePath);
processUDIDs.put(udid, process);
return "Collecting ADB logs for device " + udid + " for package "+packageName+" in file " + filePath;
return "Collecting ADB logs for device " + udid + " for package " + packageName + " in file " + filePath;
}

public String stopADBLog(String udid) throws Exception {
Process p = processUDIDs.get(udid);
int id = (getPid(p) > 0) ? getPid(p) : 0;
cmd.runCommandThruProcess("kill -9 " + id);
return "Stopped collecting ADB logs " + udid;
if (getPid(p) > 0) {
cmd.runCommandThruProcess("kill -9 " + getPid(p));
return "Stopped collecting ADB logs " + udid;
} else
return "No process found to kill";

}

public int getPid(Process process) {
Expand Down