Skip to content

exit if the user has requested a specific port #954

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
joehand merged 3 commits into from
Jul 5, 2018
Merged

exit if the user has requested a specific port #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eaa0d5
exit if the user has requested a specific port
Mar 7, 2018
83431f9
make help message consistent
joehand Jul 5, 2018
17ee4ac
Use network error directly and emit exit event
joehand Jul 5, 2018
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
2 changes: 1 addition & 1 deletion bin/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var config = {
defaults: [
{ name: 'dir', abbr: 'd', help: 'set the directory for Dat' },
{ name: 'logspeed', default: 400 },
{ name: 'port', default: 3282, help: 'port to use for connections' },
{ name: 'port', help: 'port to use for connections (default port: 3282 or first available)' },
{ name: 'utp', default: true, boolean: true, help: 'use utp for discovery' },
{ name: 'http', help: 'serve dat over http (default port: 8080)' },
{ name: 'debug', default: !!process.env.DEBUG && !debug.enabled, boolean: true },
Expand Down
12 changes: 12 additions & 0 deletions src/lib/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ function trackNetwork (state, bus) {
var network = state.dat.joinNetwork(opts, function () {
bus.emit('network:callback')
})

network.on('error', function (err) {
if (err.code === 'EADDRINUSE') {
if (opts.port) {
bus.emit('exit:warn', `Specified port (${opts.port}) in use. Please use another port.`)
} else {
debug(err.message + ' trying random port')
}
} else {
return bus.emit('exit:error', err)
}
})
state.network = xtend(network, state.network)
bus.emit('dat:network')

Expand Down