Fix
This commit is contained in:
parent
5dfb6bc22f
commit
a21ce7fba1
|
@ -57,7 +57,7 @@ app.start = function(bootOptions, port, callback) {
|
|||
});
|
||||
};
|
||||
|
||||
app.boot = function(myBootOptions, callback) {
|
||||
app.boot = function(bootOptions, callback) {
|
||||
// Internatinalization
|
||||
|
||||
if (fs.existsSync(localeDir)) {
|
||||
|
@ -118,7 +118,7 @@ app.boot = function(myBootOptions, callback) {
|
|||
}
|
||||
}
|
||||
|
||||
let bootOptions = {
|
||||
let myBootOptions = {
|
||||
appRootDir: __dirname,
|
||||
appConfigRootDir: rootDir,
|
||||
modelsRootDir: rootDir,
|
||||
|
@ -129,10 +129,10 @@ app.boot = function(myBootOptions, callback) {
|
|||
};
|
||||
|
||||
if (fs.existsSync(`/etc/salix`))
|
||||
bootOptions.dsRootDir = `/etc/salix`;
|
||||
myBootOptions.dsRootDir = `/etc/salix`;
|
||||
|
||||
Object.assign(bootOptions, myBootOptions);
|
||||
boot(this, bootOptions, callback);
|
||||
Object.assign(myBootOptions, bootOptions);
|
||||
boot(this, myBootOptions, callback);
|
||||
};
|
||||
|
||||
if (require.main === module)
|
||||
|
|
Loading…
Reference in New Issue