Skip to content

Patch 1 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sm2017 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Patch 1 #79

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
923f305
Configurable app startup
sm2017 Aug 3, 2019
be95aff
Configurable agent startup
sm2017 Aug 3, 2019
20e5978
Update config.default.js
sm2017 Aug 3, 2019
259ce3f
don't import breaking changes
sm2017 Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';

module.exports = agent => {
require('./lib/loader')(agent);
if (agent.config.sequelize.agent) require('./lib/loader')(agent);
};
2 changes: 1 addition & 1 deletion app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

module.exports = app => {
require('./lib/loader')(app);
if (app.config.sequelize.app) require('./lib/loader')(app);
};

3 changes: 3 additions & 0 deletions config/config.default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
'use strict';

exports.sequelize = {
app: true,
agent: false,

dialect: 'mysql',
database: '',
host: 'localhost',
Expand Down