Skip to content

Commit

Permalink
Added eslint and fixed an issue from #158
Browse files Browse the repository at this point in the history
  • Loading branch information
seejohnrun committed Jun 26, 2017
1 parent 3ed1d77 commit 5939dec
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 13 deletions.
25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"env": {
"es6": true,
"node": true
},
"extends": "eslint:recommended",
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
]
}
}
2 changes: 1 addition & 1 deletion lib/document_stores/memcached.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MemcachedDocumentStore.connect = function(options) {
// Save file in a key
MemcachedDocumentStore.prototype.set =
function(key, data, callback, skipExpire) {
MemcachedDocumentStore.client.set(key, data, function(err, reply) {
MemcachedDocumentStore.client.set(key, data, function(err) {
err ? callback(false) : callback(true);
}, skipExpire ? 0 : this.expire);
};
Expand Down
4 changes: 2 additions & 2 deletions lib/document_stores/postgres.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PostgresDocumentStore.prototype = {
key,
data,
that.expireJS && !skipExpire ? that.expireJS + now : null
], function (err, result) {
], function (err) {
if (err) {
winston.error('error persisting value to postgres', { error: err });
return callback(false);
Expand All @@ -50,7 +50,7 @@ PostgresDocumentStore.prototype = {
client.query('UPDATE entries SET expiration = $1 WHERE ID = $2', [
that.expireJS + now,
result.rows[0].id
], function (err, result) {
], function (err) {
if (!err) {
done();
}
Expand Down
6 changes: 3 additions & 3 deletions lib/document_stores/redis.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RedisDocumentStore.connect = function(options) {
if (options.password) {
RedisDocumentStore.client.auth(options.password);
}
RedisDocumentStore.client.select(index, function(err, reply) {
RedisDocumentStore.client.select(index, function(err) {
if (err) {
winston.error(
'error connecting to redis index ' + index,
Expand All @@ -46,7 +46,7 @@ RedisDocumentStore.connect = function(options) {
// Save file in a key
RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
var _this = this;
RedisDocumentStore.client.set(key, data, function(err, reply) {
RedisDocumentStore.client.set(key, data, function(err) {
if (err) {
callback(false);
}
Expand All @@ -62,7 +62,7 @@ RedisDocumentStore.prototype.set = function(key, data, callback, skipExpire) {
// Expire a key in expire time if set
RedisDocumentStore.prototype.setExpiration = function(key) {
if (this.expire) {
RedisDocumentStore.client.expire(key, this.expire, function(err, reply) {
RedisDocumentStore.client.expire(key, this.expire, function(err) {
if (err) {
winston.error('failed to set expiry on key: ' + key);
}
Expand Down
10 changes: 4 additions & 6 deletions lib/key_generators/dictionary.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ var fs = require('fs');

var DictionaryGenerator = function(options) {
//Options
if (!options)
return done(Error('No options passed to generator'));
if (!options.path)
return done(Error('No dictionary path specified in options'));

if (!options) throw Error('No options passed to generator');
if (!options.path) throw Error('No dictionary path specified in options');

//Load dictionary
fs.readFile(options.path, 'utf8', (err,data) => {
fs.readFile(options.path, 'utf8', (err, data) => {
if (err) throw err;
this.dictionary = data.split(/[\n\r]+/);
});
Expand Down
2 changes: 1 addition & 1 deletion lib/key_generators/phonetic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Draws inspiration from pwgen and http://tools.arantius.com/password
var PhoneticKeyGenerator = function(options) {
var PhoneticKeyGenerator = function() {
// No options
};

Expand Down

0 comments on commit 5939dec

Please sign in to comment.