Skip to content

Commit

Permalink
fix: log errors, improved messages (#156)
Browse files Browse the repository at this point in the history
Spelling errors, improved error logs.
  • Loading branch information
devotox committed Sep 8, 2020
1 parent 05a68cf commit c87ce2f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/commands/registration/pbsz.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
directive: 'PBSZ',
handler: function ({command} = {}) {
if (!this.secure) return this.reply(202, 'Not suppored');
if (!this.secure) return this.reply(202, 'Not supported');
this.bufferSize = parseInt(command.arg, 10);
return this.reply(200, this.bufferSize === 0 ? 'OK' : 'Buffer too large: PBSZ=0');
},
Expand Down
2 changes: 1 addition & 1 deletion src/commands/registration/prot.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const _ = require('lodash');
module.exports = {
directive: 'PROT',
handler: function ({command} = {}) {
if (!this.secure) return this.reply(202, 'Not suppored');
if (!this.secure) return this.reply(202, 'Not supported');
if (!this.bufferSize && typeof this.bufferSize !== 'number') return this.reply(503);

switch (_.toUpper(command.arg)) {
Expand Down
12 changes: 6 additions & 6 deletions src/connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ class FtpConnection extends EventEmitter {
return new Promise((resolve, reject) => {
if (letter.socket && letter.socket.writable) {
this.log.trace({port: letter.socket.address().port, encoding: letter.encoding, message: letter.message}, 'Reply');
letter.socket.write(letter.message + '\r\n', letter.encoding, (err) => {
if (err) {
this.log.error(err);
return reject(err);
letter.socket.write(letter.message + '\r\n', letter.encoding, (error) => {
if (error) {
this.log.error('[Process Letter] Socket Write Error', { error: error.message });
return reject(error);
}
resolve();
});
Expand All @@ -147,8 +147,8 @@ class FtpConnection extends EventEmitter {
.then((satisfiedLetters) => Promise.mapSeries(satisfiedLetters, (letter, index) => {
return processLetter(letter, index);
}))
.catch((err) => {
this.log.error(err);
.catch((error) => {
this.log.error('Satisfy Parameters Error', { error: error.message });
});
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/connector/passive.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ class Passive extends Connector {
}
});
});
})
.catch((error) => {
this.log.trace(error.message);
throw error;
});
}

Expand Down

0 comments on commit c87ce2f

Please sign in to comment.