Merge pull request #26 from akb89/develop

Develop

db/mongoose.js

@@ -13,6 +13,7 @@ async function connectToDatabase(uri) {
       keepAlive: 120,
       connectTimeoutMS: 0,
       socketTimeoutMS: 0,
+      useNewUrlParser: true,
     };
 
     await mongoose.connect(uri, options);

logger/logger.js

@@ -1,26 +1,33 @@
 const winston = require('winston');
 
-const error = new (winston.Logger)({
+const myFormat = winston.format.combine(winston.format.timestamp(),
+                                        winston.format.colorize(),
+                                        winston.format.printf(mess => `[${mess.timestamp}] ${mess.level}: ${mess.message}`));
+
+const error = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'error',
       colorize: true,
     }),
   ],
 });
 
-const warn = new (winston.Logger)({
+const warn = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'warn',
       colorize: true,
     }),
   ],
 });
 
-const info = new (winston.Logger)({
+const info = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'info',
       colorize: true,
     }),
@@ -32,9 +39,10 @@ const info = new (winston.Logger)({
   ],
 });
 
-const verbose = new (winston.Logger)({
+const verbose = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'verbose',
       colorize: true,
     }),
@@ -46,9 +54,10 @@ const verbose = new (winston.Logger)({
   ],
 });
 
-const debug = new (winston.Logger)({
+const debug = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'debug',
       colorize: true,
     }),
@@ -60,9 +69,10 @@ const debug = new (winston.Logger)({
   ],
 });
 
-const silly = new (winston.Logger)({
+const silly = winston.createLogger({
   transports: [
     new (winston.transports.Console)({
+      format: myFormat,
       level: 'silly',
       colorize: true,
     }),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noframenet",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "A set of scripts to import FrameNet XML data to a MongoDB database",
   "keywords": [
     "FrameNet",
@@ -39,18 +39,18 @@
     "ascii-progress": "^1.0.5",
     "bluebird": "^3.5.0",
     "jsonix": "^2.4.1",
-    "mongoose": "^5.0.0",
-    "noframenet-core": "^5.4.1",
-    "winston": "^2.4.0"
+    "mongoose": "^5.2.9",
+    "noframenet-core": "^5.4.3",
+    "winston": "^3.0.0"
   },
   "devDependencies": {
     "chai": "^4.0.2",
-    "eslint": "^4.15.0",
-    "eslint-config-airbnb": "^16.1.0",
+    "eslint": "^5.4.0",
+    "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.5.1",
     "mocha": "^5.0.0",
-    "rewire": "^3.0.2"
+    "rewire": "^4.0.1"
   }
 }

scripts/check.js

@@ -1,8 +1,5 @@
 const path = require('path');
 const mongoose = require('mongoose');
-const config = require('./../config');
-const driver = require('./../db/mongoose');
-const counts = require('./../framenet/counts');
 
 const AnnotationSet = require('noframenet-core').AnnotationSet;
 const Corpus = require('noframenet-core').Corpus;
@@ -20,6 +17,10 @@ const SemType = require('noframenet-core').SemType;
 const Sentence = require('noframenet-core').Sentence;
 const ValenceUnit = require('noframenet-core').ValenceUnit;
 
+const config = require('./../config');
+const driver = require('./../db/mongoose');
+const counts = require('./../framenet/counts');
+
 const logger = config.logger;
 
 async function check(dbUri) {

scripts/clean.js

@@ -1,6 +1,6 @@
+const mongoose = require('mongoose');
 const config = require('./../config');
 const driver = require('./../db/mongoose');
-const mongoose = require('mongoose');
 mongoose.Promise = require('bluebird');
 
 const logger = config.logger;

scripts/extract.js

@@ -16,6 +16,9 @@ const Pattern = require('noframenet-core').Pattern;
 const SemType = require('noframenet-core').SemType;
 const Sentence = require('noframenet-core').Sentence;
 const ValenceUnit = require('noframenet-core').ValenceUnit;
+const mongoose = require('mongoose');
+const Promise = require('bluebird');
+
 const config = require('./../config');
 const driver = require('./../db/mongoose');
 const hierarchiesExtractor = require('./extraction/hierarchies');
@@ -24,8 +27,6 @@ const fullTextsExtractor = require('./extraction/fullTexts');
 const lexUnitsExtractor = require('./extraction/lexUnits');
 const relationsExtractor = require('./extraction/relations');
 const semTypesExtractor = require('./extraction/semTypes');
-const mongoose = require('mongoose');
-const Promise = require('bluebird');
 
 mongoose.Promise = Promise;
 

scripts/fix.js

@@ -3,9 +3,9 @@
  */
 const Pattern = require('noframenet-core').Pattern;
 const ValenceUnit = require('noframenet-core').ValenceUnit;
+const mongoose = require('mongoose');
 const config = require('./../config');
 const driver = require('./../db/mongoose');
-const mongoose = require('mongoose');
 mongoose.Promise = require('bluebird');
 
 const logger = config.logger;