Merge pull request #1142 from UniversityOfHelsinkiCS/trunk

Decrease suicide rate
UniversityOfHelsinkiCS · Jul 19, 2019 · 38afeed · 38afeed
2 parents 5777497 + 95f0de7
commit 38afeed
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/services/backend/oodikone2-backend/src/database/connection.js b/services/backend/oodikone2-backend/src/database/connection.js
@@ -5,16 +5,14 @@ const conf = require('../conf-backend')
 const sequelize = new Sequelize(conf.DB_URL, {
   schema: conf.DB_SCHEMA,
   searchPath: conf.DB_SCHEMA,
-  logging: false,
-  operatorsAliases: false
+  logging: false
 })
 sequelize.query(`SET SESSION search_path to ${conf.DB_SCHEMA}`)
 
 const sequelizeKone = new Sequelize(conf.DB_URL_KONE, {
   schema: conf.DB_SCHEMA_KONE,
   searchPath: conf.DB_SCHEMA_KONE,
-  logging: false,
-  operatorsAliases: false
+  logging: false
 })
 sequelizeKone.query(`SET SESSION search_path to ${conf.DB_SCHEMA_KONE}`)
 

diff --git a/services/backend/updater_writer/database/connection.js b/services/backend/updater_writer/database/connection.js
@@ -6,8 +6,13 @@ const conf = require('../conf-backend')
 const sequelize = new Sequelize(conf.DB_URL, {
   schema: conf.DB_SCHEMA,
   searchPath: conf.DB_SCHEMA,
-  logging: false,
-  operatorsAliases: false
+  retry: {
+    max: 5,
+    match: [
+      Sequelize.TimeoutError
+    ]
+  },
+  logging: false
 })
 sequelize.query(`SET SESSION search_path to ${conf.DB_SCHEMA}`)
 
@@ -54,4 +59,4 @@ module.exports = {
   sequelize,
   migrationPromise,
   forceSyncDatabase
-}
+}
diff --git a/services/backend/updater_writer/updater/database_updater.js b/services/backend/updater_writer/updater/database_updater.js
@@ -71,6 +71,7 @@ const updateStudent = async (student, stan) => {
     if (err.parent.code === '25P02') {
       console.log('Transaction aborted')
     } else if (err.message === 'deadlock detected') {
+      console.log(err)
       console.log('Deadlock suicide')
       stan.close()
       process.exit(1)

diff --git a/services/oodikone2-analytics/src/database/connection.js b/services/oodikone2-analytics/src/database/connection.js
@@ -4,8 +4,7 @@ const conf = require('../conf')
 
 const sequelize = new Sequelize(conf.DB_URL, {
   schema: conf.DB_SCHEMA,
-  logging: false,
-  operatorsAliases: false
+  logging: false
 })
 const runMigrations = async () => {
   try {

diff --git a/services/oodikone2-userservice/src/database/connection.js b/services/oodikone2-userservice/src/database/connection.js
@@ -4,8 +4,7 @@ const conf = require('../conf')
 
 const sequelize = new Sequelize(conf.DB_URL, {
   schema: conf.DB_SCHEMA,
-  logging: false,
-  operatorsAliases: false
+  logging: false
 })
 const runMigrations = async () => {
   try {