Skip to content

Commit

Permalink
Merge "[FAB-8058] typo fix and logging align"
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhaochy1990
zhaochy1990 authored and Gerrit Code Review committed Feb 8, 2018
2 parents 541cb82 + e7b89bc commit 91fa863
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 48 deletions.
76 changes: 36 additions & 40 deletions fabric-client/lib/impl/CouchDBKeyValueStore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var logger = utils.getLogger('CouchDBKeyValueStore.js');
var CouchDBKeyValueStore = class extends api.KeyValueStore {
/**
* @typedef {Object} CouchDBOpts
* @property {stirng} url The CouchDB instance url, in the form of http(s)://<user>:<password>@host:port
* @property {string} url The CouchDB instance url, in the form of http(s)://<user>:<password>@host:port
* @property {string} name Optional. Identifies the name of the database to use. Default: <code>member_db</code>.
*/

Expand All @@ -45,7 +45,7 @@ var CouchDBKeyValueStore = class extends api.KeyValueStore {
* @param {CouchDBOpts} options Settings used to connect to a CouchDB instance
*/
constructor(options) {
logger.debug('constructor, options: ' + JSON.stringify(options));
logger.debug('constructor', { options: options });

if (!options || !options.url) {
throw new Error('Must provide the CouchDB database url to store membership data.');
Expand All @@ -64,26 +64,23 @@ var CouchDBKeyValueStore = class extends api.KeyValueStore {
this._name = options.name;
}

logger.debug('options.url - ' + options.url);
logger.debug('options.name - ' + options.name);

return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
// Initialize the CouchDB database client
var dbClient = nano(self._url);
// Check if the database already exists. If not, create it.
dbClient.db.get(self._name, function(err, body) {
dbClient.db.get(self._name, function (err, body) {
// Check for error
if (err) {
// Database doesn't exist
if (err.error == 'not_found') {
logger.debug(util.format('No %s found, creating %s', self._name, self._name));
logger.debug('No %s found, creating %s', self._name, self._name);

dbClient.db.create(self._name, function(err, body) {
dbClient.db.create(self._name, function (err, body) {
if (err) {
return reject(new Error(util.format('Failed to create %s database due to error: %s', self._name, err.stack ? err.stack : err)));
}

logger.debug(util.format('Created %s database', self._name));
logger.debug('Created %s database', self._name);
// Specify it as the database to use
self._database = dbClient.use(self._name);
resolve(self);
Expand All @@ -94,7 +91,7 @@ var CouchDBKeyValueStore = class extends api.KeyValueStore {
}
} else {
// Database exists
logger.debug(util.format('%s already exists', self._name));
logger.debug('%s already exists', self._name);
// Specify it as the database to use
self._database = dbClient.use(self._name);
resolve(self);
Expand All @@ -104,78 +101,77 @@ var CouchDBKeyValueStore = class extends api.KeyValueStore {
}

getValue(name) {
logger.debug('getValue: ' + name);
logger.debug('getValue', { key: name });

var self = this;
return new Promise(function(resolve, reject) {
self._database.get(name, function(err, body) {
return new Promise(function (resolve, reject) {
self._database.get(name, function (err, body) {
// Check for error on retrieving from database
if (err) {
if (err.error !== 'not_found') {
logger.error('getValue: ' + name + ', ERROR: [member_db.get] - ', err.error);
logger.error('getValue: %s, ERROR: [%s.get] - ', name, self._name, err.error);
return reject(err.error);
} else {
logger.debug('getValue: ' + name + ', Entry does not exist');
logger.debug('getValue: %s, Entry does not exist', name);
return resolve(null);
}
} else {
logger.debug('getValue: ' + name + ', Retrieved message from member_db.');
logger.debug('getValue: %s, Retrieved message from %s.', name, self._name);
return resolve(body.member);
}
});
});
}

setValue(name, value) {
logger.debug('setValue: ' + name);
logger.debug('setValue', { key: name });

var self = this;

return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
// Attempt to retrieve from the database to see if the entry exists
self._database.get(name, function(err, body) {
self._database.get(name, function (err, body) {
// Check for error on retrieving from database
if (err) {
if (err.error !== 'not_found') {
logger.error('setValue: ' + name + ', ERROR: [member_db.get] - ', err.error);
logger.error('setValue: %s, ERROR: [%s.get] - ', name, self._name, err.error);
reject(err.error);
} else {
// Entry does not exist
logger.debug('setValue: ' + name + ', Entry does not exist, insert it.');
logger.debug('setValue: %s, Entry does not exist, insert it.', name);
self._dbInsert({ _id: name, member: value })
.then( function (status) {
logger.debug('setValue add: ' + name + ', status: ' + status);
if (status == true) resolve(value);
else reject(new Error('Couch database insert add failed.'));
});
.then(function (status) {
logger.debug('setValue add: ' + name + ', status: ' + status);
if (status == true) resolve(value);
else reject(new Error('Couch database insert add failed.'));
});
}
} else {
// Entry already exists and must be updated
logger.debug('setValue: ' + name + ', Retrieved entry from member_db.');

// Update the database entry using the latest rev number
logger.debug('setValue: ' + name + ', Latest rev number : ' + body._rev);
logger.debug('setValue: %s, Retrieved entry from %s. Latest rev number: %s', name, self._name, body._rev);

self._dbInsert({ _id: name, _rev: body._rev, member: value })
.then( function (status) {
logger.debug('setValue update: ' + name + ', status: ' + status);
if (status == true) resolve(value);
else reject(new Error('Couch database insert update failed.'));
});
.then(function (status) {
logger.debug('setValue update: ' + name + ', status: ' + status);
if (status == true) resolve(value);
else reject(new Error('Couch database insert update failed.'));
});
}
});
});
}

_dbInsert(options) {
logger.debug('setValue, _dbInsert, options: ' + JSON.stringify(options));
logger.debug('setValue, _dbInsert', { options: options });
var self = this;
return new Promise(function(resolve,reject) {
self._database.insert(options, function(err, body, header) {
return new Promise(function (resolve, reject) {
self._database.insert(options, function (err, body, header) {
if (err) {
logger.error('setValue, _dbInsert, ERROR: [member_db.insert] - ', err.error);
logger.error('setValue, _dbInsert, ERROR: [%s.insert] - ', self._name, err.error);
reject(new Error(err.error));
} else {
logger.debug('setValue, _dbInsert, Inserted member into member_db.');
logger.debug('setValue, _dbInsert, Inserted member into %s.', self._name);
resolve(true);
}
});
Expand Down
16 changes: 8 additions & 8 deletions fabric-client/lib/impl/FileKeyValueStore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var FileKeyValueStore = class extends api.KeyValueStore {
* for the store
*/
constructor(options) {
logger.debug('FileKeyValueStore.js - constructor');
logger.debug('constructor', { options: options });

if (!options || !options.path) {
throw new Error('Must provide the path to the directory to hold files for the store.');
Expand All @@ -50,10 +50,10 @@ var FileKeyValueStore = class extends api.KeyValueStore {

var self = this;
this._dir = options.path;
return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
fs.mkdirs(self._dir, function (err) {
if (err) {
logger.debug('FileKeyValueStore.js - constructor, error creating directory, code: ' + err.code);
logger.error('constructor, error creating directory, code: %s' , err.code);
return reject(err);
}
return resolve(self);
Expand All @@ -62,11 +62,11 @@ var FileKeyValueStore = class extends api.KeyValueStore {
}

getValue(name) {
logger.debug('FileKeyValueStore -- getValue');
logger.debug('getValue', { key: name });

var self = this;

return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
var p = path.join(self._dir, name);
fs.readFile(p, 'utf8', function (err, data) {
if (err) {
Expand All @@ -82,13 +82,13 @@ var FileKeyValueStore = class extends api.KeyValueStore {
}

setValue(name, value) {
logger.debug('FileKeyValueStore -- setValue');
logger.debug('setValue', { key: name });

var self = this;

return new Promise(function(resolve, reject) {
return new Promise(function (resolve, reject) {
var p = path.join(self._dir, name);
fs.writeFile(p, value, function(err) {
fs.writeFile(p, value, function (err) {
if (err) {
reject(err);
} else {
Expand Down

0 comments on commit 91fa863

Please sign in to comment.