github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on pathwatcher.watch to determine if files exist.

Browse Source
This commit is contained in:
Ben Newman
2014-12-17 16:00:01 -05:00
parent 6f41fe9b4d
commit 745de90b4e
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/watch.js
View File

@@ -407,33 +407,24 @@ _.extend(Watcher.prototype, {
return;
}
var onWatchEvent = self._makeWatchEventCallback(absPath);
if (self.justCheckOnce) {
onWatchEvent();
return;
}
self._makeWatchEventCallback(absPath)();
try {
} else if (files.exists(absPath)) {
var onWatchEvent = self._makeWatchEventCallback(absPath);
entry.watcher = pathwatcher.watch(absPath, onWatchEvent);
} catch (err) {
if (err.code === "ENOENT" || // For fs.watch.
(err instanceof TypeError && // For pathwatcher.watch.
err.message === "Unable to watch path")) {
var parentDir = files.pathDirname(absPath);
if (parentDir !== absPath) {
self._watchFileOrDirectory(parentDir);
}
} else {
throw err;
}
}
if (entry.watcher) {
// If we successfully created the watcher, invoke the callback
// immediately, so that we examine this file at least once.
onWatchEvent();
} else {
var parentDir = files.pathDirname(absPath);
if (parentDir === absPath) {
throw new Error("Unable to watch parent directory of " + absPath);
}
self._watchFileOrDirectory(parentDir);
}
},