denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugin-loader: Move logging of failed features to status()

Browse Source 
Still log an error message if critical features fail, as loaded
plugins/features are not logged in that case.

This way loaded plugins are printed before failed features and
the relation is easier to make for users.  It also allows programs
to log this message on a different level.
This commit is contained in:
Tobias Brunner
2013-06-21 15:22:46 +02:00
parent 607f8e9906
commit 0d25c4ef87
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/plugin_loader.c
+11 -7
View File
@@ -968,14 +968,11 @@ METHOD(plugin_loader_t, load_plugins, bool,
if (!critical_failed)
{
load_features(this);
/* evaluate stats collected while loading the features */
critical_failed = this->stats.critical > 0;
if (this->stats.failed)
if (this->stats.critical > 0)
{
DBG1(DBG_LIB, "failed to load %d plugin feature%s (%d due to unmet "
"dependencies, %d critical)", this->stats.failed,
this->stats.failed == 1 ? "" : "s", this->stats.depends,
this->stats.critical);
critical_failed = TRUE;
DBG1(DBG_LIB, "failed to load %d critical plugin feature%s",
this->stats.critical, this->stats.critical == 1 ? "" : "s");
}
/* unload plugins that we were not able to load any features for */
purge_plugins(this);
@@ -1088,6 +1085,13 @@ METHOD(plugin_loader_t, status, void,
if (this->loaded_plugins)
{
dbg(DBG_LIB, level, "loaded plugins: %s", this->loaded_plugins);
if (this->stats.failed)
{
dbg(DBG_LIB, level, "unable to load %d plugin feature%s (%d due to "
"unmet dependencies)", this->stats.failed,
this->stats.failed == 1 ? "" : "s", this->stats.depends);
}
}
}