[snmp] Add log_to_io function for both manager and agent

Add a log_to_io Audit Trail Log converter function for
both the manager (snmpm) and agent (snmpa).
Also fixed the converter functions in the logger module,
snmp_log, which previously sometimes did not work
properly (re-open an already open log with different
properties).

OTP-9940

1 files changed, 24 insertions, 1 deletions

diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index 6d2ac8d747..89eaee9f80 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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
@@ -75,8 +75,11 @@
 
 	 %% 
 	 %% Logging
+	 log_to_txt/1, 
 	 log_to_txt/2, log_to_txt/3, log_to_txt/4,
 	 log_to_txt/5, log_to_txt/6, log_to_txt/7, 
+	 log_to_io/1,  log_to_io/2,  log_to_io/3,
+	 log_to_io/4,  log_to_io/5,  log_to_io/6, 
 	 change_log_size/1,
 	 get_log_type/0,
 	 set_log_type/1,
@@ -1371,6 +1374,9 @@ cancel_async_request(UserId, ReqId) ->
 %%%-----------------------------------------------------------------
 %%% Audit Trail Log functions (for backward compatibility)
 %%%-----------------------------------------------------------------
+
+log_to_txt(LogDir) ->
+    log_to_txt(LogDir, []). 
 log_to_txt(LogDir, Mibs) ->
     OutFile = "snmpm_log.txt",       
     LogName = ?audit_trail_log_name, 
@@ -1391,6 +1397,23 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) ->
     snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop).
 
 
+log_to_io(LogDir) ->
+    log_to_io(LogDir, []).
+log_to_io(LogDir, Mibs) ->
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+log_to_io(LogDir, Mibs, LogName) ->
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+log_to_io(LogDir, Mibs, LogName, LogFile) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start).
+log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
+    snmp:log_to_io(LogDir, Mibs, LogFile, Start, Stop).
+    
+
 change_log_size(NewSize) ->
     LogName = ?audit_trail_log_name, 
     snmp:change_log_size(LogName, NewSize).