diff options
| author | Micael Karlberg <[email protected]> | 2013-06-03 22:45:49 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-06-03 22:45:49 +0200 |
| commit | 85f775093ab974128c629809e382891cb493073a (patch) | |
| tree | d95058b046a1180564a2d7becf7be9d1d0b464b0 /lib/snmp/src/agent/snmpa_agent_sup.erl | |
| parent | 1b7d29ce5d0f6ed4e087d9a5936834b442fd769d (diff) | |
| parent | d94474a632305049330ce578e2042b454c993abb (diff) | |
| download | otp-85f775093ab974128c629809e382891cb493073a.tar.gz otp-85f775093ab974128c629809e382891cb493073a.tar.bz2 otp-85f775093ab974128c629809e382891cb493073a.zip | |
Merge branch 'bmk/snmp/snmp424_integration/r16' into maint
Diffstat (limited to 'lib/snmp/src/agent/snmpa_agent_sup.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_agent_sup.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/snmp/src/agent/snmpa_agent_sup.erl b/lib/snmp/src/agent/snmpa_agent_sup.erl index 9b8c4d12a6..2805e2dc0d 100644 --- a/lib/snmp/src/agent/snmpa_agent_sup.erl +++ b/lib/snmp/src/agent/snmpa_agent_sup.erl @@ -29,10 +29,12 @@ -export([init/1]). -define(SERVER, ?MODULE). +%% Always use plain ets for sub-agents -ifdef(snmp_debug). --define(DEFAULT_OPTS, [{verbosity, trace}]). +-define(DEFAULT_SA_OPTS, [{mib_storage, [{module, snmpa_mib_storage_ets}]}, + {verbosity, trace}]). -else. --define(DEFAULT_OPTS, []). +-define(DEFAULT_SA_OPTS, [{mib_storage, [{module, snmpa_mib_storage_ets}]}]). -endif. @@ -63,8 +65,8 @@ start_subagent(ParentAgent, Subtree, Mibs) -> Ref = make_ref(), ?d("start_subagent -> Ref: ~p", [Ref]), Options = [{priority, Prio}, - {mibs, Mibs}, - {misc_sup, snmpa_misc_sup} | ?DEFAULT_OPTS], + {mibs, Mibs}, + {misc_sup, snmpa_misc_sup} | ?DEFAULT_SA_OPTS], Agent = {{sub_agent, Max}, {snmpa_agent, start_link, [Prio, ParentAgent, Ref, Options]}, |