Skip to content

Commit 847d2a6

Browse files
author
Scott Smereka
committed
Updated install methods.
1 parent 4299069 commit 847d2a6

File tree

5 files changed

+1186
-958
lines changed

5 files changed

+1186
-958
lines changed

server/app/error/error_controller.js

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function(app, db, config) {
1717
log = fox.log,
1818
debug = config.server.debug,
1919
url = require('url');
20-
20+
2121

2222
/* ************************************************** *
2323
* ******************** Routes
@@ -45,29 +45,7 @@ module.exports = function(app, db, config) {
4545
next();
4646
}
4747

48-
// Send the error.
49-
sender.sendError(err, req, res, next);
50-
51-
// If debug mode, print out the errors in the log.
52-
if(debug) {
53-
54-
// Handle printing an error array.
55-
if(Object.prototype.toString.call( err ) === '[object Array]') {
56-
var errCount;
57-
for(var i = 0; i < err.length; i++) {
58-
errCount = i + 1;
59-
log.i("Error "+errCount+"/"+err.length+": ")
60-
log.e(err[i]);
61-
log.e(err[i]["stack"]);
62-
}
63-
} else {
64-
// Print out a single error object.
65-
log.e(err);
66-
log.e(err["stack"]);
67-
}
68-
}
69-
70-
48+
sender.sendError(err, req, res, next, debug);
7149
}
7250

7351
/**

server/app/index.js

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,44 @@ var Config = require(path.resolve(__dirname, "../configs/config.js"));
1313

1414
// Contains predefined methods used to manage the server instance.
1515
var server = {
16+
17+
// Setup and configure the server for use.
18+
install: function(app, db, config, log) {
19+
var installer;
20+
21+
if (config.paths["serverInstallerLib"]) {
22+
var Installer = require(config.paths.serverInstallerLib);
23+
installer = new Installer(db, config, log);
24+
} else {
25+
return log.e("Invalid path or no path specified for paths.serverInstallerLib in the configuration object.");
26+
}
27+
28+
installer.install(function (err, results) {
29+
if (err) {
30+
return log.e(err);
31+
}
32+
33+
log.s("Server Installed Successfully!");
34+
});
35+
},
36+
1637
start: function(config, next) {
38+
var installServer = this.install;
39+
40+
// Get the arguments from commandline.
41+
var args = process.argv.slice(2);
1742

1843
// Perform any additional configuration of the server
1944
// before it starts loading routes and finishing up.
2045

21-
app.start(config, function() {
22-
23-
// Get the arguments from commandline.
24-
var args = process.argv.slice(2);
46+
app.start(config, function(err, app, db, config, server, fox, io) {
47+
if(err) {
48+
return console.log(err);
49+
}
2550

26-
// Handle Install Flag
51+
// Handle install flag in arguments.
2752
if(args.indexOf('-i') > -1) {
28-
console.log("Install server.");
53+
installServer(app, db, config, fox.log);
2954
}
3055

3156
});

0 commit comments

Comments
 (0)