Skip to content

server: fix interval unit #53

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
feross merged 1 commit into from
Jan 6, 2015
Merged

server: fix interval unit #53

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
10 changes: 5 additions & 5 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function Server (opts) {
opts = opts || {}

self._intervalMs = opts.interval
? opts.interval / 1000
: 10 * 60 // 10 min (in secs)
? opts.interval
: 10 * 60 * 1000 // 10 min

self._trustProxy = !!opts.trustProxy

Expand Down Expand Up @@ -209,7 +209,7 @@ Server.prototype._onAnnounce = function (params, cb) {
swarm.announce(params, function (err, response) {
if (response) {
if (!response.action) response.action = common.ACTIONS.ANNOUNCE
if (!response.intervalMs) response.intervalMs = self._intervalMs
if (!response.interval) response.interval = Math.ceil(self._intervalMs / 1000)

if (params.compact === 1) {
var peers = response.peers
Expand Down Expand Up @@ -258,7 +258,7 @@ Server.prototype._onScrape = function (params, cb) {
var response = {
action: common.ACTIONS.SCRAPE,
files: {},
flags: { min_request_interval: self._intervalMs }
flags: { min_request_interval: Math.ceil(self._intervalMs / 1000) }
}

results.forEach(function (result) {
Expand All @@ -285,7 +285,7 @@ function makeUdpPacket (params) {
return Buffer.concat([
common.toUInt32(common.ACTIONS.ANNOUNCE),
common.toUInt32(params.transactionId),
common.toUInt32(params.intervalMs),
common.toUInt32(params.interval),
common.toUInt32(params.incomplete),
common.toUInt32(params.complete),
params.peers
Expand Down