Skip to content

Configurator: fixed logging consistency #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thorgrin merged 1 commit into from
Apr 27, 2015
Merged

Configurator: fixed logging consistency #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions base/src/configurator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ int config_add_input(configurator *config, struct plugin_config *plugin, int ind
/* check api version */
unsigned int *plugin_api_version = (unsigned int *) dlsym(config->input.dll_handler, "ipfixcol_api_version");
if (!plugin_api_version) { /* no api version symbol */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s). API version number is missing",
config->proc_id, plugin->conf.name, plugin->conf.file);
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s'; API version number is missing...",
config->proc_id, plugin->conf.name, plugin->conf.file);
goto err;
} else if (*plugin_api_version != IPFIXCOL_API_VERSION_NUMBER) { /* wrong api version */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s) with version %ui. Version %ui is required",
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s' with version %ui; at least version %ui is required...",
config->proc_id, plugin->conf.name, plugin->conf.file, *plugin_api_version, IPFIXCOL_API_VERSION_NUMBER);
goto err;
}
Expand Down Expand Up @@ -417,11 +417,11 @@ int config_add_inter(configurator *config, struct plugin_config *plugin, int ind
/* check api version */
unsigned int *plugin_api_version = (unsigned int *) dlsym(im_plugin->dll_handler, "ipfixcol_api_version");
if (!plugin_api_version) { /* no api version symbol */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s). API version number is missing",
config->proc_id, plugin->conf.name, plugin->conf.file);
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s'; API version number is missing...",
config->proc_id, plugin->conf.name, plugin->conf.file);
goto err;
} else if (*plugin_api_version != IPFIXCOL_API_VERSION_NUMBER) { /* wrong api version */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s) with version %ui. Version %ui is required",
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s' with version %ui; at least version %ui is required...",
config->proc_id, plugin->conf.name, plugin->conf.file, *plugin_api_version, IPFIXCOL_API_VERSION_NUMBER);
goto err;
}
Expand Down Expand Up @@ -535,11 +535,11 @@ int config_add_storage(configurator *config, struct plugin_config *plugin, int i
/* check api version */
unsigned int *plugin_api_version = (unsigned int *) dlsym(st_plugin->dll_handler, "ipfixcol_api_version");
if (!plugin_api_version) { /* no api version symbol */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s). API version number is missing",
config->proc_id, plugin->conf.name, plugin->conf.file);
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s'; API version number is missing...",
config->proc_id, plugin->conf.name, plugin->conf.file);
goto err;
} else if (*plugin_api_version != IPFIXCOL_API_VERSION_NUMBER) { /* wrong api version */
MSG_ERROR(msg_module, "[%d] Unable to load plugin %s (%s) with version %ui. Version %ui is required",
MSG_ERROR(msg_module, "[%d] Unable to load plugin '%s' with version %ui; at least version %ui is required...",
config->proc_id, plugin->conf.name, plugin->conf.file, *plugin_api_version, IPFIXCOL_API_VERSION_NUMBER);
goto err;
}
Expand Down