Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made it so the setupEnding event is sent out after the setup failure message is printed but before the setup success message is printed (reduces the number of error messages if you cancel during setup). Changed the semantics of the output.progress string's data.component data. It is now a dotted hierarchical string giving progressively more detail about what is being set up. e.g., 'database', 'database.default.settings', 'database.default.settings.connection.port'. If outputters are interpreting data.component then any trailing unknown levels of detail should be ignored. This allows the setup routines to potentially give much more useful output. Fixed the default stdout output string for setup (it has <text variable=""> instead of value="").

Browse Source
This commit is contained in:
ian%hixie.ch 2001-11-09 16:39:29 +00:00
parent 93f2b40fba
commit 90d2164530
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webtools/PLIF/PLIF/Service/Components/AdminCommands.pm
View File

@ -80,11 +80,17 @@ sub cmdSetup {
if (not $result) {
$result = $app->getSelectingServiceList('setup.install')->setupInstall($app);
}
$app->getPipingServiceList('setup.events.end')->setupEnding($app);
# report on the result
if ($result) {
# if we failed, first report that then signal that
# configuration has ended
$self->dump(9, "Failed to setup because argument '$result' was missing.");
$app->output->setupFailed($result);
$app->getPipingServiceList('setup.events.end')->setupEnding($app);
} else {
# if it did not fail, then signal that configuration ended and
# then use our swanky new setup to tell the user it worked.
$app->getPipingServiceList('setup.events.end')->setupEnding($app);
$app->output->setupSucceeded();
}
}
@ -121,7 +127,7 @@ sub outputSetupProgress {
sub strings {
return (
'setup' => 'The message given at the end of the setup command (only required for stdout, since it is the only way to trigger setup); data.failed is a boolean, data.result is the error message if any',
'setup.progress' => 'Progress messages given during setup (only required for stdout); data.component is the item being set up',
'setup.progress' => 'Progress messages given during setup (only required for stdout); data.component is a dotted hierarchical string giving progressively more detail about what is being set up. e.g., \'database\', \'database.default.settings\', \'database.default.settings.connection.port\'. If outputters are interpreting data.component then any trailing unknown levels of detail should be ignored.',
);
}
@ -131,7 +137,7 @@ sub getDefaultString {
my($app, $protocol, $string) = @_;
if ($protocol eq 'stdout') {
if ($string eq 'setup') {
return ('COSES', '<text xmlns="http://bugzilla.mozilla.org/coses"><if lvalue="(data.failed)" condition="=" rvalue="1">Failed with:<br/><text variable="(data.result)"/></if><else>Succeeded!</else><br/></text>');
return ('COSES', '<text xmlns="http://bugzilla.mozilla.org/coses"><if lvalue="(data.failed)" condition="=" rvalue="1">Failed with:<br/><text value="(data.result)"/></if><else>Succeeded!</else><br/></text>');
} elsif ($string eq 'setup.progress') {
return ('COSES', '<text xmlns="http://bugzilla.mozilla.org/coses">Setup: configuring <text value="(data.component)"/>...<br/></text>');
}