tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace macros on single line module_plugin

This commit is contained in:
Robert Nelson 2015-06-07 18:07:11 -07:00
parent 7c1ca7444c
commit 58c3e219c1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/pandora_agent
View File

@ -510,6 +510,9 @@ sub parse_conf_modules($) {
# Make the module run the first time # Make the module run the first time
$module->{'counter'} = $module->{'intensive_interval'}; $module->{'counter'} = $module->{'intensive_interval'};
# Replace macros
replace_macros ($module);
push (@Modules, {%{$module}}); push (@Modules, {%{$module}});
} else { } else {
$module->{'func'} = \&module_plugin; $module->{'func'} = \&module_plugin;
@ -601,7 +604,7 @@ sub write_broker_conf($){
my ($broker_agent) = @_; my ($broker_agent) = @_;
my $content = ''; my $content = '';
# I don't think the following should be copied either: proxy_*, secondary_* # I don't think the following should be copied either: proxy_*
my %ignored_tokens = ( my %ignored_tokens = (
'broker_agent' => 1, 'agent_name_cmd' => 1, 'udp_server' => 1, 'cron_mode' => 1 'broker_agent' => 1, 'agent_name_cmd' => 1, 'udp_server' => 1, 'cron_mode' => 1
); );