Skip to content

Commit 6e68f8c

Browse files
cesinecesine
authored
Merge pull request #64 from cesine/reduce_logs
Reduce logs
2 parents ed20512 + 009f3e5 commit 6e68f8c

15 files changed

Lines changed: 58 additions & 38 deletions

File tree

‎app/components/App/index.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import Helmet from 'react-helmet'
44
import Q from 'q'
55
import React, { Component } from 'react'
66

7+
FieldDBObject.todo = function () {}
8+
FieldDBObject.warn = function () {}
79
FieldDBObject.confirm = function (message, optionalLocale) {
810
const deferred = Q.defer()
911
console.warn('Not confirming: ', message)

‎app/components/CorpusMask/CorpusMaskContainer.test.js‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Container::CorpusMask', function () {
2121
},
2222
children: [], // To avoid rendering the Search component
2323
corpusMask: Immutable.fromJS({
24-
dbname: 222,
24+
dbname: 'abc',
2525
title: 'the-corpusMask-title',
2626
team: {
2727
id: 1234,
@@ -30,6 +30,9 @@ describe('Container::CorpusMask', function () {
3030
fields: [],
3131
prototypeApp: {
3232
url: ''
33+
},
34+
connection: {
35+
dbname: 'abc'
3336
}
3437
}),
3538
searchResults: Immutable.fromJS([])
@@ -42,6 +45,13 @@ describe('Container::CorpusMask', function () {
4245
})
4346

4447
expect(doc).to.have.keys(['component', 'root', 'node', 'nodes', 'length', 'options', 'complexSelector'])
48+
49+
const images = doc.find('img')
50+
expect(images).to.exist
51+
expect(images.length).to.equal(2)
52+
53+
const avatar = images.nodes[0]
54+
expect(avatar.getAttribute('src')).to.equal('https://secure.gravatar.com/avatar/900150983cd24fb0d6963f7d28e17f72.jpg?s=96&d=retro&r=pg')
4555
})
4656

4757
it('should support OLAC metadata in header', function () {
@@ -52,16 +62,19 @@ describe('Container::CorpusMask', function () {
5262
teamname: 'someone'
5363
},
5464
corpusMask: Immutable.fromJS({
55-
dbname: 222,
65+
dbname: 'abc',
5666
title: 'the-corpusMask-title',
67+
connection: {
68+
dbname: 'abc'
69+
},
5770
description: 'hi \n* a \n* list',
5871
dateCreated: 1411424261782,
5972
dateModified: 1490462360903,
6073
keywords: 'kartuli, batumi, natural speech',
6174
copyright: 'Georgian Together Users',
6275
termsOfUse: 'any \nterms',
6376
team: {
64-
id: 1234,
77+
id: '123-efg',
6578
name: 'jack'
6679
},
6780
fields: [{
@@ -129,7 +142,10 @@ describe('Container::CorpusMask', function () {
129142
teamname: 'someone'
130143
},
131144
corpusMask: Immutable.fromJS({
132-
dbname: 222,
145+
dbname: 'abc',
146+
connection: {
147+
dbname: 'abc'
148+
},
133149
title: 'the-corpusMask-title',
134150
description: 'hi \n* a \n* list',
135151
termsOfUse: 'some \nterms',

‎app/components/CorpusMask/index.jsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class CorpusMaskContainer extends Component {
4242
})
4343
}
4444
render () {
45-
let {corpusMask} = this.props
45+
let { corpusMask } = this.props
46+
const fielddbCorpusMask = new CorpusMask(corpusMask.toJS())
4647

4748
if (!corpusMask || !corpusMask.get('team')) {
4849
return (
@@ -68,7 +69,7 @@ class CorpusMaskContainer extends Component {
6869

6970
const descriptionFormatted = marked(corpusMask.get('description') || '')
7071
const termsOfUse = corpusMask.get('termsOfUse') || ''
71-
const termsOfUseFormatted = marked(termsOfUse)
72+
const termsOfUseFormatted = marked(termsOfUse || '')
7273

7374
return (
7475
<div>
@@ -160,7 +161,7 @@ class CorpusMaskContainer extends Component {
160161
<h1 className='media-heading'>{corpusMask.get('title')}</h1>
161162
<div className='media'>
162163
<a href={`${corpusMask.get('prototypeApp').get('url')}/prototype/_design/prototype/user.html#login/${corpusMask.get('dbname')}`} className='pull-right'>
163-
<img src={'https://secure.gravatar.com/avatar/' + corpusMask.getIn(['connection', 'gravatar']) + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
164+
<img src={'https://secure.gravatar.com/avatar/' + fielddbCorpusMask.connection.gravatar + '.jpg?s=96&d=retro&r=pg'} alt='Corpus image' className='media-object' />
164165
</a>
165166
<div className='media-body'>
166167
<div className='description' dangerouslySetInnerHTML={{
@@ -196,7 +197,7 @@ class CorpusMaskContainer extends Component {
196197
</div>
197198
<hr />
198199
<footer>
199-
<p>© {corpusMask.get('copyright')} {corpusMask.get('startYear')} - 2017 </p>
200+
<p>© {corpusMask.get('copyright')} {corpusMask.get('startYear')} - 2020 </p>
200201
<div className='tabbable'>
201202
<ul className='nav nav-tabs'>
202203
<li className='active'><a href='#terms' data-toggle='tab'>Terms of Use for {corpusMask.get('title')}</a></li>

‎app/components/Media/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class Media extends Component {
5656
render () {
5757
const media = this.props.media
5858
if (!media || !media.filename || !this.props.corpus) {
59-
console.warn('Unable to render media, filename or corpus was missing', media, this.props.corpus)
59+
// console.warn('Unable to render media, filename or corpus was missing', media, this.props.corpus)
6060
return (
6161
<span />
6262
)

‎app/components/UserMask/index.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class UserMaskContainer extends Component {
4848
</div>
4949
<hr />
5050
<footer>
51-
<p>© {userMask.get('username')} {userMask.get('startYear')} 2017
51+
<p>© {userMask.get('username')} {userMask.get('startYear')} - 2020
5252
<a href='http://creativecommons.org/licenses/by/3.0/' rel='license' title='Creative Commons Attribution 3.0 License'>link
5353
<img src='//i.creativecommons.org/l/by/3.0/88x31.png' alt='License' />
5454
</a>

‎lib/activity.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var activityHeatMap = function(dbname) {
2828
url: config.corpus.url + "/" + activityDbname + "/_design/activities/_view/one-year-weekly?group=true"
2929
}).then(function(body) {
3030
if (body && body.rows) {
31-
console.log(new Date() + " responded with activity heat map " + body.rows.length + " for: " + activityDbname);
31+
// console.log(new Date() + " responded with activity heat map " + body.rows.length + " for: " + activityDbname);
3232
return deferred.resolve(body);
3333
}
3434

‎lib/corpus.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,16 @@ var getCorpusMask = function(dbname, next) {
4141
corpusMask.team.corpus = corpusMask;
4242
corpusMask.connection = corpusMask.connection || {};
4343
corpusMask.team.fetch(config.corpus.url + "/" + validateIdentifier.identifier).then(function() {
44-
console.log(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
45-
console.log(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
46-
console.log(new Date() + " TODO consider saving corpus.json with the team inside.");
44+
// Must prime the gravatar:
45+
// corpusMask.debug(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
46+
// corpusMask.debug(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
47+
// corpusMask.debug(new Date() + " TODO consider saving corpus.json with the team inside.");
4748
deferred.resolve(corpusMask);
4849
}, function(err) {
49-
console.log("error fetching corpus team", err);
50+
console.log(new Date() + "error fetching corpus team", err);
5051
deferred.resolve(corpusMask);
5152
}).fail(function(err) {
52-
console.log("error fetching corpus team", err);
53+
console.log(new Date() + "error fetching corpus team", err);
5354
deferred.resolve(corpusMask);
5455
});
5556
}, next).fail(next);
@@ -114,7 +115,7 @@ var getCorpusMaskFromTitleAsUrl = function(userMask, titleAsUrl, next) {
114115
}
115116

116117
var bestMatch = matchingCorpusConnections[0];
117-
console.log(new Date() + " user's default gravatar " + userMask.gravatar);
118+
// console.log(new Date() + " user's default gravatar " + userMask.gravatar);
118119
userMask.corpora.debug(new Date() + " best match " + bestMatch.dbname);
119120
return getCorpusMask(bestMatch.dbname, next);
120121
};

‎lib/user.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ var getUserMask = function getUserMask(username, next) {
6868
userPrivate.userMask.corpora.push(corpusConnection);
6969
return;
7070
}
71-
console.log(new Date() + " Requesting the corpus mask details", corpusConnection.dbname);
71+
// console.log(new Date() + " Requesting the corpus mask details", corpusConnection.dbname);
7272
var corpusMask = new CorpusMask({
7373
connection: corpusConnection
7474
});
7575
promises.push(corpusMask.fetch(config.corpus.url + "/" + corpusConnection.dbname).then(function() {
76-
// Must prime the gravatar
77-
console.log(new Date() + " Using connection from the corpus mask details", corpusMask.connection.owner, corpusMask.connection.gravatar);
76+
// Must prime the gravatar:
77+
corpusMask.debug(new Date() + " Using connection from the corpus mask details", corpusMask.connection.owner, corpusMask.connection.gravatar);
7878
corpusMask.connection.title = corpusMask.connection.title;
7979
corpusMask.connection.description = corpusMask.connection.description;
8080
if (!corpusMask.connection.websiteUrl || corpusMask.connection.websiteUrl === config.public.url || corpusMask.connection.websiteUrl.indexOf("lingsync.org") === corpusMask.connection.websiteUrl.length - 12) {
@@ -83,18 +83,18 @@ var getUserMask = function getUserMask(username, next) {
8383
userPrivate.userMask.corpora.push(corpusMask.connection);
8484
return corpusMask.connection;
8585
}).fail(function(err) {
86-
console.log("failed to fetchcorpus mask", err);
86+
console.log(new Date() + "failed to fetchcorpus mask", err);
8787
corpusMask.connection.websiteUrl = corpusMask.connection.websiteUrl || "/" + corpusConnection.dbname.replace("-", "/");
8888
userPrivate.userMask.corpora.push(corpusConnection);
8989
}));
9090
});
9191

92-
console.log(new Date() + " Waiting for " + promises.length + " to download details");
93-
Q.allSettled(promises).done(function(results) {
94-
console.log(new Date() + " TODO Consider saving the user to avoid making requests again ", results.length);
95-
console.log(new Date() + " userPrivate.userMask.corpora.titles ", userPrivate.userMask.corpora.map(function(mask) {
96-
return mask.title;
97-
}));
92+
// console.log(new Date() + " Waiting for " + promises.length + " to download details");
93+
Q.allSettled(promises).done(function() {
94+
// console.log(new Date() + " TODO Consider saving in the user to avoid making requests again ", results.length);
95+
// console.log(new Date() + " userPrivate.userMask.corpora.titles ", userPrivate.userMask.corpora.map(function(mask) {
96+
// return mask.title;
97+
// }));
9898
deferred.resolve(userPrivate.userMask);
9999
});
100100
}).fail(function(err) {

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fielddb-webserver",
3-
"version": "5.10.3",
3+
"version": "5.26.21",
44
"description": "Web site for FieldDB corpora pages.",
55
"homepage": "https://github.com/FieldDB/FieldDB/issues/milestones?state=closed",
66
"repository": {
@@ -40,7 +40,7 @@
4040
"debug": "^2.6.3",
4141
"express": "^4.13.3",
4242
"express-session": "^1.11.3",
43-
"fielddb": "5.121.19-rc0",
43+
"fielddb": "^5.168.13-rc0",
4444
"forever": "^0.15.1",
4545
"handlebars": "^4.0.2",
4646
"history": "^1.17.0",
@@ -77,7 +77,7 @@
7777
"lint:es6": "eslint --fix --ext .jsx --ext .js app bin",
7878
"start": "./bin/fielddb-web-server",
7979
"start:watch": "NODE_PATH=./app concurrently --kill-others \"nodemon ./bin/fielddb-web-server\" \"node webpack.server.js\" \"gulp css:watch\"",
80-
"start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node app/server",
80+
"start:production": "NODE_ENV=production PORT=8000 API_BASE_URL=http://localhost:8000 NODE_PATH=./app node bin/fielddb-web-server",
8181
"test": "NODE_ENV=test mocha test/**/*-spec.js",
8282
"test:ci": "NODE_ENV=test NODE_PATH=./app mocha --compilers js:babel-register -r app/spec/support/setup.mocha.js --recursive 'app/**/*.test.js'",
8383
"test:site": "node test/integration/links.js",

‎public/ar_minda_es_elene.png‎

127 KB
Loading

0 commit comments

Comments
 (0)