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/misc/snmp_config.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/misc/snmp_config.erl')
| -rw-r--r-- | lib/snmp/src/misc/snmp_config.erl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl index 0bed097b62..22fe25941c 100644 --- a/lib/snmp/src/misc/snmp_config.erl +++ b/lib/snmp/src/misc/snmp_config.erl @@ -238,7 +238,7 @@ config_agent_sys() -> MibStorage = case MibStorageType of ets -> - ets; + [{module, snmpa_mib_storage_ets}]; dets -> DetsDir = ask("6b. Mib storage directory (absolute path)?", DbDir, fun verify_dir/1), @@ -248,13 +248,14 @@ config_agent_sys() -> "default", fun verify_mib_storage_action/1), case DetsAction of default -> - {dets, DetsDir}; + [{module, snmpa_mib_storage_dets}, + {options, [{dir, DetsDir}]}]; _ -> - {dets, DetsDir, DetsAction} + [{module, snmpa_mib_storage_dets}, + {options, [{dir, DetsDir}, + {action, DetsAction}]}] end; mnesia -> -% Nodes = ask("Mib storage nodes?", "none", -% fun verify_mib_storage_nodes/1), Nodes = [], MnesiaAction = ask("6b. Mib storage [mnesia] database start " "action " @@ -262,11 +263,18 @@ config_agent_sys() -> "default", fun verify_mib_storage_action/1), case MnesiaAction of default -> - {mnesia, Nodes}; + [{module, snmpa_mib_storage_mnesia}, + {options, [{nodes, Nodes}]}]; _ -> - {mnesia, Nodes, MnesiaAction} + [{module, snmpa_mib_storage_mnesia}, + {options, [{nodes, Nodes}, + {action, MnesiaAction}]}] end end, + + %% Here we should ask about mib-server data module, + %% but as we only have one at the moment... + TargetCacheVerb = ask("7. Target cache verbosity " "(silence/info/log/debug/trace)?", "silence", fun verify_verbosity/1), |