GithubStar/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-10-29 12:41:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2696 from curtissiemens/master

Browse Source 
Do not filter out system.log lines that do not have dates
This commit is contained in:
Jonathan Lipps
2014-05-28 10:21:22 -07:00
parent e433bbc315 edd7a9fa74
commit 106efedf8e
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/devices/ios/ios-log.js
+18 -6
View File
@@ -21,6 +21,7 @@ var IosLog = function (opts) {
this.iosLogStarted = false;
this.iosLogStartTime = null;
this.calledBack = false;
this.loggingModeOn = true;
this.logs = [];
this.logRow = "";
this.logsSinceLastRequest = [];
@@ -49,6 +50,9 @@ IosLog.prototype.startCapture = function (cb) {
spawnEnv.PATH = process.env.PATH + ":" + limdDir;
spawnEnv.DYLD_LIBRARY_PATH = limdDir + ":" + process.env.DYLD_LIBRARY_PATH;
logger.info("Starting iOS device log capture via idevicesyslog");
// idevicesyslog retrieves many old device log lines that came before it was
// started so filter those out until we encounter new log lines.
this.loggingModeOn = false;
this.proc = spawn("idevicesyslog", ["-u", this.udid], {env: spawnEnv});
this.finishStartingLogCapture(cb);
} else {
@@ -143,12 +147,20 @@ IosLog.prototype.onOutput = function (data, prefix) {
_.each(logs, function (log) {
log = log.trim();
if (log) {
// Filter old log rows
var logRowParts = log.split(" ");
var logRowDate = new Date(
Date.parse(this.iosLogStartTime.getFullYear() + " " + logRowParts[0] + " " + logRowParts[1] + " " + logRowParts[2])
);
if (!this.udid || logRowDate.isAfter(this.iosLogStartTime)) {
// Turn logging on when the 1st row that has a new date comes through.
// - Some system.log lines do not have a leading date and therefore never pass the
// logRowDate.isAfter(this.iosLogStartTime) check so we require a state flag here,
// otherwise all the lines without dates get filtered out even if they are new.
if (!this.loggingModeOn) {
var logRowParts = log.split(" ");
var logRowDate = new Date(
Date.parse(this.iosLogStartTime.getFullYear() + " " + logRowParts[0] + " " + logRowParts[1] + " " + logRowParts[2])
);
if (logRowDate.isAfter(this.iosLogStartTime)) {
this.loggingModeOn = true;
}
}
if (this.loggingModeOn) {
var logObj = {
timestamp: Date.now()
, level: 'ALL'