github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

change startup message to be after npm (and print a "Restarting" message)

Browse Source
This commit is contained in:
David Glasser
2013-03-07 11:43:51 -08:00
parent d7de90d353
commit cb43b5252e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/run.js
View File

@@ -618,6 +618,7 @@ exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
}
};
var process_startup_printer;
// Using `inFiber` since bundling can yield when loading a manifest
// file from warehouse.meteor.com.
var restart_server = inFiber(function () {
@@ -668,6 +669,7 @@ exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
start_watching();
Status.running = true;
process_startup_printer();
server_handle = start_server({
bundlePath: bundle_path,
outerPort: outer_port,
@@ -696,7 +698,6 @@ exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
var mongo_err_count = 0;
var mongo_err_timer;
var mongo_startup_print_timer;
var process_startup_printer;
var launch = function () {
Status.mongoHandle = mongo_runner.launch_mongo(
app_dir,
@@ -707,11 +708,6 @@ exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
clearTimeout(mongo_startup_print_timer);
mongo_startup_print_timer = null;
}
// print startup if we haven't already.
if (process_startup_printer) {
process_startup_printer();
process_startup_printer = null;
}
restart_server();
},
function (code, signal) { // On Mongo dead
@@ -751,8 +747,14 @@ exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
mongo_startup_print_timer = setTimeout(function () {
process.stdout.write("Initializing mongo database... this may take a moment.\n");
}, 3000);
var first = true;
process_startup_printer = function () {
process.stdout.write("Running on: http://localhost:" + outer_port + "/\n");
if (first) {
process.stdout.write("=> Running on: http://localhost:" + outer_port + "/\n");
first = false;
} else {
process.stdout.write("=> Meteor server restarted\n");
}
};
start_update_checks(bundle_opts.release);