LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

simplified the logs

Browse source
This commit is contained in:
bill bittner 2017-06-19 19:34:34 -07:00
parent 04f1406c73
commit dbe83da336
11 changed files with 45 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/publishController.js
View file

@ -6,7 +6,7 @@ const walledAddress = config.get('WalletConfig.lbryAddress');
const errorHandlers = require('../helpers/libraries/errorHandlers.js');
function createPublishParams (claim, filePath, license, nsfw) {
logger.debug(`createPublishParams for ${claim}`);
logger.debug(`Creating Publish Parameters for "${claim}"`);
const publishParams = {
name : claim,
file_path: filePath,
@ -28,13 +28,12 @@ function createPublishParams (claim, filePath, license, nsfw) {
function deleteTemporaryFile (filePath) {
fs.unlink(filePath, err => {
if (err) throw err;
logger.info(`successfully deleted ${filePath}`);
logger.debug(`successfully deleted ${filePath}`);
});
}
module.exports = {
publish (claim, fileName, filePath, fileType, license, nsfw, socket, visitor) {
logger.debug(`publish start for ${claim}`);
// update the client
socket.emit('publish-status', 'Your image is being published (this might take a second)...');
// send to analytics

14
controllers/serveController.js
View file

@ -5,7 +5,6 @@ const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicCla
const isFreePublicClaim = require('../helpers/functions/isFreePublicClaim.js');
function getClaimAndHandleResponse (claimUri, resolve, reject) {
logger.debug(`getClaimAndHandleResponse start for ${claimUri}`);
lbryApi
.getClaim(claimUri)
.then(({ file_name, download_path, mime_type }) => {
@ -16,14 +15,12 @@ function getClaimAndHandleResponse (claimUri, resolve, reject) {
});
})
.catch(error => {
logger.error(`getClaimAndHandleResponse error for ${claimUri}`);
reject(error);
});
}
module.exports = {
getClaimByName (claimName) {
logger.debug(`getClaimByName start for ${claimName}`);
const deferred = new Promise((resolve, reject) => {
// get all free public claims
getAllFreePublicClaims(claimName)
@ -53,19 +50,16 @@ module.exports = {
}
})
.catch(error => {
logger.error('Sequelize encountered an error', error);
reject(error);
});
})
.catch(error => {
logger.debug(`getClaimByName failure for ${claimName}`);
reject(error);
});
});
return deferred;
},
getClaimByClaimId (claimName, claimId) {
logger.debug(`getClaimByClaimId start for ${claimName}`);
const deferred = new Promise((resolve, reject) => {
const uri = `${claimName}#${claimId}`;
// resolve the Uri
@ -79,14 +73,14 @@ module.exports = {
.then(claim => {
// if a found locally...
if (claim) {
logger.debug(`A record was found for ${claimName} ${claimId}`);
logger.debug(`A File record was found for ${claimName}/${claimId}`);
// if the outpoint's match return it
if (claim.dataValues.outpoint === resolvedOutpoint) {
logger.debug(`local outpoint matched for ${claimName} ${claimId}`);
logger.debug('local outpoint matched');
resolve(claim.dataValues);
// if the outpoint's don't match, fetch updated claim
} else {
logger.debug(`local outpoint did not match ${claimName} ${claimId}`);
logger.debug('local outpoint did not match');
getClaimAndHandleResponse(uri, resolve, reject);
}
// ... otherwise use daemon to retrieve it
@ -99,12 +93,10 @@ module.exports = {
}
})
.catch(error => {
logger.error('Sequelize encountered an error', error);
reject(error);
});
})
.catch(error => {
logger.debug(`getClaimByClaimId error for ${claimName}`);
reject(error);
});
});

2
controllers/showController.js
View file

@ -1,9 +1,7 @@
const getAllFreePublicClaims = require('../helpers/functions/getAllFreePublicClaims.js');
const logger = require('winston');
module.exports = {
getAllClaims (claimName) {
logger.debug(`getAllClaims start for ${claimName}`);
return getAllFreePublicClaims(claimName);
},
};

11
helpers/functions/getAllFreePublicClaims.js
View file

@ -3,6 +3,7 @@ const lbryApi = require('../libraries/lbryApi.js');
const logger = require('winston');
function filterForFreePublicClaims (claimsListArray) {
logger.debug('filtering claims list for free, public claims');
if (!claimsListArray) {
return null;
}
@ -16,7 +17,7 @@ function filterForFreePublicClaims (claimsListArray) {
}
function orderTopClaims (claimsListArray) {
logger.silly('ordering the top claims');
logger.debug('ordering the top claims');
claimsListArray.sort((a, b) => {
if (a.amount === b.amount) {
return a.height < b.height;
@ -34,11 +35,11 @@ module.exports = claimName => {
.getClaimsList(claimName)
.then(({ claims }) => {
const claimsList = claims;
console.log('>> Number of claims:', claimsList.length);
logger.debug(`Number of claims: ${claimsList.length}`);
// return early if no claims were found
if (claimsList.length === 0) {
reject('NO_CLAIMS');
console.log('exiting due to lack of claims');
logger.debug('exiting due to lack of claims');
return;
}
// filter the claims to return only free, public claims
@ -46,7 +47,7 @@ module.exports = claimName => {
// return early if no free, public claims were found
if (!freePublicClaims || freePublicClaims.length === 0) {
reject('NO_FREE_PUBLIC_CLAIMS');
console.log('exiting due to lack of free or public claims');
logger.debug('exiting due to lack of free or public claims');
return;
}
// order the claims
@ -55,7 +56,7 @@ module.exports = claimName => {
resolve(orderedPublicClaims);
})
.catch(error => {
console.log(">> 'claim_list' error");
logger.error('error received from lbryApi.getClaimsList', error);
reject(error);
});
});

4
helpers/functions/isFreePublicClaim.js
View file

@ -1,5 +1,7 @@
const logger = require('winston');
module.exports = ({ value }) => {
console.log('>> check: isFreePublicClaim?');
logger.debug('checking isFreePublicClaim ?');
if (
(value.stream.metadata.license.indexOf('Public Domain') !== -1 || value.stream.metadata.license.indexOf('Creative Commons') !== -1) &&
(!value.stream.metadata.fee || value.stream.metadata.fee.amount === 0)

4
helpers/libraries/errorHandlers.js
View file

@ -1,5 +1,8 @@
const logger = require('winston');
module.exports = {
handleRequestError (error, res) {
logger.error('Handling Request Error:', error);
if (error === 'NO_CLAIMS' || error === 'NO_FREE_PUBLIC_CLAIMS') {
res.status(307).render('noClaims');
} else if (error.response) {
@ -11,6 +14,7 @@ module.exports = {
}
},
handlePublishError (error) {
logger.error('Handling Publish Error:', error);
if (error.code === 'ECONNREFUSED') {
return 'Connection refused. The daemon may not be running.';
} else if (error.response.data.error) {

16
helpers/libraries/lbryApi.js
View file

@ -12,7 +12,7 @@ function createFilesRecord (name, claimId, outpoint, fileName, filePath, fileTyp
module.exports = {
publishClaim (publishParams, fileName, fileType) {
logger.silly(`publishClaim start for ${fileName}`);
logger.debug(`Publishing claim for "${fileName}"`);
const deferred = new Promise((resolve, reject) => {
axios
.post('http://localhost:5279/lbryapi', {
@ -20,21 +20,19 @@ module.exports = {
params: publishParams,
})
.then(response => {
logger.silly(`publishClaim success for ${fileName}`);
const result = response.data.result;
createFilesRecord(
publishParams.name, result.claim_id, `${result.txid}:${result.nout}`, fileName, publishParams.file_path, fileType, publishParams.metadata.nsfw);
resolve(result);
})
.catch(error => {
logger.error(`publishClaim error for ${fileName}`, error);
reject(error);
});
});
return deferred;
},
getClaim (uri) {
logger.silly(`getClaim start for ${uri}`);
logger.debug(`Getting Claim for "${uri}"`);
const deferred = new Promise((resolve, reject) => {
axios
.post('http://localhost:5279/lbryapi', {
@ -42,7 +40,6 @@ module.exports = {
params: { uri, timeout: 30 },
})
.then(({ data }) => {
logger.silly(`getClaim success for ${uri}`, data);
// check to make sure the daemon didn't just time out
if (!data.result) {
reject(JSON.stringify(data));
@ -60,14 +57,13 @@ module.exports = {
resolve(result);
})
.catch(error => {
logger.error(`getClaim error for ${uri}`, error);
reject(error);
});
});
return deferred;
},
getClaimsList (claimName) {
logger.silly(`getClaimsList start for ${claimName}`);
logger.debug(`Getting Claim List for "${claimName}"`);
const deferred = new Promise((resolve, reject) => {
axios
.post('http://localhost:5279/lbryapi', {
@ -75,18 +71,16 @@ module.exports = {
params: { name: claimName },
})
.then(({ data }) => {
logger.silly(`getClaimsList success for ${claimName}`);
resolve(data.result);
})
.catch(error => {
logger.error(`getClaimsList error for ${claimName}`, error);
reject(error);
});
});
return deferred;
},
resolveUri (uri) {
logger.silly(`resolveUri start for ${uri}`);
logger.debug(`Resolving URI for "${uri}"`);
const deferred = new Promise((resolve, reject) => {
axios
.post('http://localhost:5279/lbryapi', {
@ -94,11 +88,9 @@ module.exports = {
params: { uri },
})
.then(({ data }) => {
logger.silly(`resolveUri success for ${uri}`);
resolve(data.result);
})
.catch(error => {
logger.error(`resolveUri error for ${uri}`, error);
reject(error);
});
});

32
helpers/logging/loggerSetup.js
View file

@ -6,26 +6,30 @@ module.exports = (winston, logLevel, logDir) => {
fs.mkdirSync(logDir);
}
winston.level = logLevel;
winston.add(
winston.transports.File, {
filename : `${logDir}speechLogs.log`,
level : logLevel,
json : true,
timestamp : tsFormat,
colorize : true,
prettyPrint: true,
}
);
winston.configure({
transports: [
new (winston.transports.Console)({
level : logLevel,
timestamp : false,
colorize : true,
prettyPrint: true,
}),
new (winston.transports.File)({
filename : `${logDir}speechLogs.log`,
level : logLevel,
json : false,
timestamp : tsFormat,
colorize : true,
prettyPrint: true,
}),
]
});
winston.handleExceptions(new winston.transports.File({
filename : `${logDir}uncaughtExceptions.log`,
humanReadableUnhandledException: true,
}));
// winston.exitOnError = false;
winston.error('Level 0');
winston.warn('Level 1');
winston.info('Level 2');

4
routes/api-routes.js
View file

@ -5,7 +5,7 @@ const logger = require('winston');
module.exports = app => {
// route to run a claim_list request on the daemon
app.get('/api/claim_list/:claim', ({ originalUrl, params }, res) => {
logger.info(`GET request on ${originalUrl}`);
logger.debug(`GET request on ${originalUrl}`);
lbryApi
.getClaimsList(params.claim)
.then(claimsList => {
@ -17,7 +17,7 @@ module.exports = app => {
});
// route to run a resolve request on the daemon
app.get('/api/resolve/:uri', ({ originalUrl, params }, res) => {
logger.info(`GET request on ${originalUrl}`);
logger.debug(`GET request on ${originalUrl}`);
lbryApi
.resolveUri(params.uri)
.then(resolvedUri => {

8
routes/serve-routes.js
View file

@ -34,7 +34,7 @@ function serveFile ({ fileName, fileType, filePath }, res) {
module.exports = (app, ua, googleAnalyticsId) => {
// route to fetch one free public claim
app.get('/:name/:claim_id', ({ originalUrl, params }, res) => {
logger.info(`Get request on ${originalUrl}`);
logger.debug(`GET request on ${originalUrl}`);
const routeString = `${params.name}/${params.claim_id}`;
// google analytics
ua(googleAnalyticsId, { https: true }).event('Serve Route', '/name/claimId', routeString).send();
@ -42,28 +42,24 @@ module.exports = (app, ua, googleAnalyticsId) => {
serveController
.getClaimByClaimId(params.name, params.claim_id)
.then(fileInfo => {
logger.debug(`${originalUrl} getClaimByClaimId returned successfully.`);
serveFile(fileInfo, res);
})
.catch(error => {
logger.error(`${originalUrl} getClaimByClaimId returned an error.`, error);
errorHandlers.handleRequestError(error, res);
});
});
// route to fetch one free public claim
app.get('/:name', ({ originalUrl, params }, res) => {
logger.info(`Get request on ${originalUrl}`);
logger.debug(`GET request on ${originalUrl}`);
// google analytics
ua(googleAnalyticsId, { https: true }).event('Serve Route', '/name', params.name).send();
// begin image-serve processes
serveController
.getClaimByName(params.name)
.then(fileInfo => {
logger.debug(`${originalUrl} getClaimByName returned successfully.`);
serveFile(fileInfo, res);
})
.catch(error => {
logger.error(`${originalUrl} getClaimByName returned an error.`, error);
errorHandlers.handleRequestError(error, res);
});
});

3
routes/show-routes.js
View file

@ -5,7 +5,7 @@ const logger = require('winston');
module.exports = (app, ua, googleAnalyticsId) => {
// route to fetch all free public claims
app.get('/:name/all', ({ originalUrl, params }, res) => {
logger.info(`Get request on ${originalUrl}`);
logger.debug(`GET request on ${originalUrl}`);
// google analytics
ua(googleAnalyticsId, { https: true }).event('Show Routes', '/name/all', `${params.name}/all`).send();
// fetch all free public claims
@ -15,7 +15,6 @@ module.exports = (app, ua, googleAnalyticsId) => {
res.status(200).render('allClaims', { claims: orderedFreePublicClaims });
})
.catch(error => {
logger.error(`${originalUrl} getAllClaims returned an error.`, error);
errorHandlers.handleRequestError(error, res);
});
});