Skip to content
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.

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

Emit more warnings #1021

Merged
merged 1 commit into from Jan 19, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Emit more warnings

Convert some debug statements that could be useful for an API user
(either because they want to show to the user, or to react to the
warning in some way)

Fixes #960
  • Loading branch information
feross committed Jan 19, 2017
commit 6870e7c7450ea9f3379a053189187e9c99c8b067
@@ -387,7 +387,7 @@ Torrent.prototype._getMetadataFromServer = function () {

function getMetadataFromURL (url, cb) {
if (url.indexOf('http://') !== 0 && url.indexOf('https://') !== 0) {
self._debug('skipping non-http xs param: %s', url)
self.emit('warning', new Error('skipping non-http xs param: ' + url))
return cb(null)
}

@@ -402,7 +402,7 @@ Torrent.prototype._getMetadataFromServer = function () {
try {
req = get.concat(opts, onResponse)
} catch (err) {
self._debug('skipping invalid url xs param: %s', url)
self.emit('warning', new Error('skipping invalid url xs param: ' + url))
return cb(null)
}

@@ -413,11 +413,11 @@ Torrent.prototype._getMetadataFromServer = function () {
if (self.metadata) return cb(null)

if (err) {
self._debug('http error from xs param: %s', url)
self.emit('warning', new Error('http error from xs param: ' + url))
return cb(null)
}
if (res.statusCode !== 200) {
self._debug('non-200 status code %s from xs param: %s', res.statusCode, url)
self.emit('warning', new Error('non-200 status code ' + res.statusCode + ' from xs param: ' + url))
return cb(null)
}

@@ -427,12 +427,12 @@ Torrent.prototype._getMetadataFromServer = function () {
} catch (err) {}

if (!parsedTorrent) {
self._debug('got invalid torrent file from xs param: %s', url)
self.emit('warning', new Error('got invalid torrent file from xs param: ' + url))
return cb(null)
}

if (parsedTorrent.infoHash !== self.infoHash) {
self._debug('got torrent file with incorrect info hash from xs param: %s', url)
self.emit('warning', new Error('got torrent file with incorrect info hash from xs param: ' + url))
return cb(null)
}

@@ -795,13 +795,13 @@ Torrent.prototype.addWebSeed = function (url) {
if (this.destroyed) throw new Error('torrent is destroyed')

if (!/^https?:\/\/.+/.test(url)) {
this._debug('ignoring invalid web seed %s', url)
this.emit('warning', new Error('ignoring invalid web seed: ' + url))
this.emit('invalidPeer', url)
return
}

if (this._peers[url]) {
this._debug('ignoring duplicate web seed %s', url)
this.emit('warning', new Error('ignoring duplicate web seed: ' + url))
this.emit('invalidPeer', url)
return
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.