diff options
| author | Micael Karlberg <[email protected]> | 2013-11-19 12:45:38 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2013-11-19 12:45:38 +0100 |
| commit | b73c98771730a6db086d3697eaa6b6ac11be0361 (patch) | |
| tree | 8bfec5285866a3947bb8ff239e59de76c9ce0437 /lib/snmp/src/misc | |
| parent | 8bcd32dfceec3b4381747046b82eec42487c7518 (diff) | |
| parent | 1508a71c3ec41347e6e34c57671028f2e4640680 (diff) | |
| download | otp-b73c98771730a6db086d3697eaa6b6ac11be0361.tar.gz otp-b73c98771730a6db086d3697eaa6b6ac11be0361.tar.bz2 otp-b73c98771730a6db086d3697eaa6b6ac11be0361.zip | |
Merge branch 'bmk/snmp/blocking_log_during_conversion' into bmk/snmp/snmp425_integration
Conflicts:
lib/snmp/src/app/snmp.erl
Diffstat (limited to 'lib/snmp/src/misc')
| -rw-r--r-- | lib/snmp/src/misc/snmp_log.erl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl index 862c1c7c0c..e4089870b8 100644 --- a/lib/snmp/src/misc/snmp_log.erl +++ b/lib/snmp/src/misc/snmp_log.erl @@ -53,8 +53,9 @@ -define(VMODULE,"LOG"). -include("snmp_verbosity.hrl"). --define(LOG_FORMAT, internal). --define(LOG_TYPE, wrap). +-define(LOG_FORMAT, internal). +-define(LOG_TYPE, wrap). +-define(BLOCK_DEFAULT, true). -record(snmp_log, {id, seqno}). @@ -401,7 +402,7 @@ do_change_size(Log, NewSize) -> %% <BACKWARD-COMPAT> log_to_txt(Log, FileName, Dir, Mibs, TextFile) -> - log_to_txt(Log, false, FileName, Dir, Mibs, TextFile). + log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile). %% </BACKWARD-COMPAT> log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile) @@ -409,7 +410,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile) log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, null, null); %% <BACKWARD-COMPAT> log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start) -> - log_to_txt(Log, false, FileName, Dir, Mibs, TextFile, Start, null). + log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, null). %% </BACKWARD-COMPAT> log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start) @@ -417,7 +418,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start) log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, null); %% <BACKWARD-COMPAT> log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) -> - log_to_txt(Log, false, FileName, Dir, Mibs, TextFile, Start, Stop). + log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, Stop). %% </BACKWARD-COMPAT> log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop) @@ -446,7 +447,7 @@ log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop) %% <BACKWARD-COMPAT> log_to_io(Log, FileName, Dir, Mibs) -> - log_to_io(Log, false, FileName, Dir, Mibs, null, null). + log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, null, null). %% </BACKWARD-COMPAT> log_to_io(Log, Block, FileName, Dir, Mibs) @@ -454,7 +455,7 @@ log_to_io(Log, Block, FileName, Dir, Mibs) log_to_io(Log, Block, FileName, Dir, Mibs, null, null); %% <BACKWARD-COMPAT> log_to_io(Log, FileName, Dir, Mibs, Start) -> - log_to_io(Log, false, FileName, Dir, Mibs, Start, null). + log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, null). %% </BACKWARD-COMPAT> log_to_io(Log, Block, FileName, Dir, Mibs, Start) @@ -462,7 +463,7 @@ log_to_io(Log, Block, FileName, Dir, Mibs, Start) log_to_io(Log, Block, FileName, Dir, Mibs, Start, null); %% <BACKWARD-COMPAT> log_to_io(Log, FileName, Dir, Mibs, Start, Stop) -> - log_to_io(Log, false, FileName, Dir, Mibs, Start, Stop). + log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, Stop). %% </BACKWARD-COMPAT> log_to_io(Log, Block, FileName, Dir, Mibs, Start, Stop) |