diff --git a/config/database.js b/config/database.js index 2d9a84b..ed6e5db 100644 --- a/config/database.js +++ b/config/database.js @@ -1,18 +1,17 @@ module.exports = ({ env }) => ({ - defaultConnection: 'default', + defaultConnection: "default", connections: { default: { - connector: 'bookshelf', + connector: "bookshelf", settings: { - client: 'mysql', - host: env('DATABASE_HOST', '127.0.0.1'), - port: env.int('DATABASE_PORT', 3306), - database: env('DATABASE_NAME', 'wa_web'), - username: env('DATABASE_USERNAME', 'root'), - password: env('DATABASE_PASSWORD', 'root'), - ssl: env.bool('DATABASE_SSL', false), + client: "mysql", + host: env("DATABASE_HOST"), + port: env.int("DATABASE_PORT"), + database: env("DATABASE_NAME"), + username: env("DATABASE_USERNAME"), + password: env("DATABASE_PASSWORD"), }, - options: {} + options: {}, }, }, }); diff --git a/model/messageModel.js b/model/messageModel.js index 2c45f7d..be6cb61 100644 --- a/model/messageModel.js +++ b/model/messageModel.js @@ -24,7 +24,7 @@ function callbacks(client, callback, type = "create") { }); client.on("disconnected", async function (session) { console.log("disconnected from ", type, session); - if (session == "UNPAIRED") { + if (session == "UNPAIRED" || session == "CONFLICT") { try { if (type == "load" && client && client.info) { console.log(getID);