diff options
| author | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
| commit | 05c8a2f9ba5c93985fb64a63f19ed4de22560829 (patch) | |
| tree | 89253eecdf161489dd68ee35ae584c99ab373443 /lib/snmp/src/agent/snmp_notification_mib.erl | |
| parent | 07b86000da9f50be61fe3fa04ac530c0cf8930d9 (diff) | |
| parent | e189bae81fbc873d3349b9dec12ef234daf9d8ad (diff) | |
| download | otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.gz otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.bz2 otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/snmp/src/agent/snmp_notification_mib.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmp_notification_mib.erl | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/snmp/src/agent/snmp_notification_mib.erl b/lib/snmp/src/agent/snmp_notification_mib.erl index 37e09f5d3e..31c7735226 100644 --- a/lib/snmp/src/agent/snmp_notification_mib.erl +++ b/lib/snmp/src/agent/snmp_notification_mib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2012. All Rights Reserved. +%% Copyright Ericsson AB 1998-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -106,17 +106,19 @@ do_reconfigure(Dir) -> read_notify_config_files(Dir) -> ?vdebug("read notify config file",[]), FileName = "notify.conf", - Gen = fun(D, Reason) -> - info_msg("failed reading config file ~s" - "~n Config Dir: ~s" - "~n Reason: ~p", - [FileName, D, Reason]), - ok - end, - Filter = fun(Notifs) -> Notifs end, - Check = fun(Entry) -> check_notify(Entry) end, + Gen = + fun (D, Reason) -> + info_msg("failed reading config file ~s" + "~n Config Dir: ~s" + "~n Reason: ~p", + [FileName, D, Reason]), + ok + end, + Order = fun snmp_conf:no_order/2, + Filter = fun snmp_conf:no_filter/1, + Check = fun (Entry, State) -> {check_notify(Entry), State} end, [Notifs] = - snmp_conf:read_files(Dir, [{Gen, Filter, Check, "notify.conf"}]), + snmp_conf:read_files(Dir, [{FileName, Gen, Order, Check, Filter}]), Notifs. check_notify({Name, Tag, Type}) -> |