[snmp/agent] Improve error handling while reading agent config files

Improve error handling while reading agent config files.

OTP-9943

1 files changed, 18 insertions, 9 deletions

diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 0d7866d94d..cc191bd956 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. 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
@@ -115,7 +115,9 @@ do_configure(Dir) ->
 
 read_internal_config_files(Dir) ->
     ?vdebug("read context config file",[]),
-    Gen    = fun(D) -> convert_context(D) end,
+    Gen    = fun(D, Reason) -> 
+		     convert_context(D, Reason) 
+	     end,
     Filter = fun(Contexts) -> Contexts end,
     Check  = fun(Entry) -> check_context(Entry) end,
     [Ctxs] = snmp_conf:read_files(Dir, [{Gen, Filter, Check, "context.conf"}]),
@@ -123,10 +125,17 @@ read_internal_config_files(Dir) ->
 
 
 read_agent(Dir) ->
-    ?vdebug("read agent config file",[]),
-    Check = fun(Entry) -> check_agent(Entry) end,
-    File  = filename:join(Dir, "agent.conf"), 
-    Agent = snmp_conf:read(File, Check),
+    ?vdebug("read agent config file", []),
+    FileName = "agent.conf", 
+    Check    = fun(Entry) -> check_agent(Entry) end,
+    File     = filename:join(Dir, FileName), 
+    Agent    = 
+	try
+	    snmp_conf:read(File, Check)
+	catch
+	    throw:{error, Reason} ->
+		error({failed_reading_config_file, Dir, FileName, Reason})
+	end,
     sort_agent(Agent).
 
 
@@ -146,9 +155,9 @@ sort_agent(L) ->
 %%-----------------------------------------------------------------
 %% Generate a context.conf file.
 %%-----------------------------------------------------------------
-convert_context(Dir) ->
+convert_context(Dir, _Reason) ->
     config_err("missing context.conf file => generating a default file", []),
-    File = filename:join(Dir,"context.conf"),
+    File = filename:join(Dir, "context.conf"),
     case file:open(File, [write]) of
 	{ok, Fid} ->
 	    ok = io:format(Fid, "~s\n", [context_header()]),
@@ -165,7 +174,7 @@ context_header() ->
     io_lib:format("%% This file was automatically generated by "
                   "snmp_config v~s  ~w-~2.2.0w-~2.2.0w "
                   "~2.2.0w:~2.2.0w:~2.2.0w\n",
-                  [?version,Y,Mo,D,H,Mi,S]).
+                  [?version, Y, Mo, D, H, Mi, S]).
 
 
 %%-----------------------------------------------------------------