aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/database-utils.ts4
-rw-r--r--server/helpers/logger.ts7
-rw-r--r--server/helpers/utils.ts9
3 files changed, 10 insertions, 10 deletions
diff --git a/server/helpers/database-utils.ts b/server/helpers/database-utils.ts
index b842ab9ec..7d6ce4ec8 100644
--- a/server/helpers/database-utils.ts
+++ b/server/helpers/database-utils.ts
@@ -1,7 +1,7 @@
1// TODO: import from ES6 when retry typing file will include errorFilter function 1// TODO: import from ES6 when retry typing file will include errorFilter function
2import retry = require('async/retry') 2import retry = require('async/retry')
3 3
4const db = require('../initializers/database') 4import { database as db } from '../initializers/database'
5import { logger } from './logger' 5import { logger } from './logger'
6 6
7function commitTransaction (t, callback) { 7function commitTransaction (t, callback) {
@@ -52,7 +52,7 @@ function transactionRetryer (func, callback) {
52} 52}
53 53
54function startSerializableTransaction (callback) { 54function startSerializableTransaction (callback) {
55 db.sequelize.transaction({ isolationLevel: 'SERIALIZABLE' }).asCallback(function (err, t) { 55 db.sequelize.transaction(/* { isolationLevel: 'SERIALIZABLE' } */).asCallback(function (err, t) {
56 // We force to return only two parameters 56 // We force to return only two parameters
57 return callback(err, t) 57 return callback(err, t)
58 }) 58 })
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 3c35e41e0..7c99db55f 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -36,13 +36,6 @@ const logger = new winston.Logger({
36 exitOnError: true 36 exitOnError: true
37}) 37})
38 38
39// TODO: useful?
40// logger.stream = {
41// write: function (message) {
42// logger.info(message)
43// }
44// }
45
46// --------------------------------------------------------------------------- 39// ---------------------------------------------------------------------------
47 40
48export { logger } 41export { logger }
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index 09c35a533..bc76cfb26 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -1,4 +1,5 @@
1import { pseudoRandomBytes } from 'crypto' 1import { pseudoRandomBytes } from 'crypto'
2import { join } from 'path'
2 3
3import { logger } from './logger' 4import { logger } from './logger'
4 5
@@ -42,6 +43,11 @@ function getFormatedObjects (objects, objectsTotal) {
42 } 43 }
43} 44}
44 45
46function root () {
47 // We are in /dist/helpers/utils.js
48 return join(__dirname, '..', '..', '..')
49}
50
45// --------------------------------------------------------------------------- 51// ---------------------------------------------------------------------------
46 52
47export { 53export {
@@ -50,5 +56,6 @@ export {
50 cleanForExit, 56 cleanForExit,
51 generateRandomString, 57 generateRandomString,
52 isTestInstance, 58 isTestInstance,
53 getFormatedObjects 59 getFormatedObjects,
60 root
54} 61}