Revert "Node update"

mozilla · May 16, 2018 · 6cacee0 · 6cacee0
1 parent f2cc92e
commit 6cacee0
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 7,212 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -3,8 +3,6 @@ module.exports = function (grunt) {
   var jscsrc = grunt.file.readJSON("node_modules/mofo-style/linters/.jscsrc");
   var jshintrc = grunt.file.readJSON("node_modules/mofo-style/linters/.jshintrc");
 
-  jshintrc.esversion = 6;
-
   var javaScriptFiles = [
     "Gruntfile.js",
     "app.js",
@@ -51,6 +49,6 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks("grunt-jscs");
 
   grunt.registerTask("clean", ["jsbeautifier:modify"]);
-  grunt.registerTask("validate", ["jshint", "jscs"]);
+  grunt.registerTask("validate", ["jsbeautifier:verify", "jshint", "jscs"]);
   grunt.registerTask("default", ["validate"]);
 };
diff --git a/app/db/index.js b/app/db/index.js
@@ -1,6 +1,6 @@
 var Sequelize = require('sequelize');
 
-module.exports = function (env, callback) {
+module.exports = function (env) {
   var sequelize;
   var health = {
     connected: false,
@@ -21,15 +21,14 @@ module.exports = function (env, callback) {
   var modelControllers = require('./models')(sequelize, env);
 
   // Sync
-  sequelize.sync()
-    .then(() => {
+  sequelize.sync().complete(function (err) {
+    if (err) {
+      handlers.dbErrorHandling(err, handlers.forkErrorHandling);
+    } else {
       health.connected = true;
       handlers.forkSuccessHandling();
-      if (callback) {
-        callback();
-      }
-    })
-    .catch(err => handlers.dbErrorHandling(err, handlers.forkErrorHandling));
+    }
+  });
 
   // Export models
   return {