diff --git a/consumerWebsite/bin/www b/consumerWebsite/bin/www index ae5fa70..9ab52eb 100644 --- a/consumerWebsite/bin/www +++ b/consumerWebsite/bin/www @@ -5,7 +5,7 @@ */ const app = require('../app'); -const mqttApp = require('../mqttApp'); +// const mqttApp = require('../mqttApp'); const debug = require('debug')('proxy-api:server'); const http = require('http'); const path = require('path'); diff --git a/consumerWebsite/database/mySQL.js b/consumerWebsite/database/mySQL.js index 255dc3a..2ed3cc4 100644 --- a/consumerWebsite/database/mySQL.js +++ b/consumerWebsite/database/mySQL.js @@ -1,31 +1,30 @@ const dotenv = require("dotenv"); const path = require('path') -require('dotenv').config({ path: path.resolve(__dirname, '../../.env') }) +require('dotenv').config({ path: path.resolve(__dirname, '../../.env') }); const Sequelize = require("sequelize"); const fs = require('fs'); const sequelize = new Sequelize( - "eco_saver", + process.env.DB_name, process.env.DB_USER, process.env.DB_PASS, { - host: "mpsqldatabase.mysql.database.azure.com", - dialect: 'mysql', + host: process.env.host, //"mpsqldatabase.mysql.database.azure.com", + dialect: process.env.DB_dialect, + storage: process.env.DB_storage, + logging: process.env.DB_logging, // attributeBehavior?: 'escape' | 'throw' | 'unsafe-legacy'; attributeBehavior: 'escape', dialectOptions: { ssl: { ca: fs.readFileSync(path.resolve(__dirname, '../cert/DigiCertGlobalRootCA.crt.pem')), }, - }, }, - - ); sequelize.authenticate().then(() => { - console.log('Connection has been established successfully.'); + console.log(`Connection to ${process.env.DB_dialect} has been established successfully.`); }).catch((error) => { console.error('Unable to connect to the database: ', error); }); diff --git a/consumerWebsite/database_test.sqlite b/consumerWebsite/database_test.sqlite new file mode 100644 index 0000000..1ed43c8 Binary files /dev/null and b/consumerWebsite/database_test.sqlite differ