Skip to content

Commit 323870f

Browse files
committed
level_logger: changes following #254
1 parent 25c1226 commit 323870f

File tree

2 files changed

+33
-51
lines changed

2 files changed

+33
-51
lines changed

src/stdlib_logger.f90

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@ module stdlib_logger
6969
write_failure = 8
7070

7171
integer, parameter, public :: &
72-
stdlib_debug_level = 10, &
73-
stdlib_information_level = 20, &
74-
stdlib_warning_level = 30, &
75-
stdlib_error_level = 40, &
76-
stdlib_io_error_level = 40, &
77-
stdlib_text_error_level = 40, &
78-
stdlib_all_level = -10 + min( &
79-
stdlib_debug_level, &
80-
stdlib_information_level, &
81-
stdlib_warning_level, &
82-
stdlib_error_level, &
83-
stdlib_io_error_level, &
84-
stdlib_text_error_level), &
85-
stdlib_none_level = 10 + max( &
86-
stdlib_debug_level, &
87-
stdlib_information_level, &
88-
stdlib_warning_level, &
89-
stdlib_error_level, &
90-
stdlib_io_error_level, &
91-
stdlib_text_error_level)
72+
debug_level = 10, &
73+
information_level = 20, &
74+
warning_level = 30, &
75+
error_level = 40, &
76+
io_error_level = 40, &
77+
text_error_level = 40, &
78+
all_level = -10 + min( &
79+
debug_level, &
80+
information_level, &
81+
warning_level, &
82+
error_level, &
83+
io_error_level, &
84+
text_error_level), &
85+
none_level = 10 + max( &
86+
debug_level, &
87+
information_level, &
88+
warning_level, &
89+
error_level, &
90+
io_error_level, &
91+
text_error_level)
9292

9393
character(*), parameter :: module_name = 'stdlib_logger'
9494

@@ -100,7 +100,7 @@ module stdlib_logger
100100

101101
logical :: add_blank_line = .false.
102102
logical :: indent_lines = .true.
103-
integer :: level = stdlib_information_level
103+
integer :: level = information_level
104104
integer, allocatable :: log_units(:)
105105
integer :: max_width = 0
106106
logical :: time_stamp = .true.
@@ -838,7 +838,7 @@ subroutine log_debug( self, message, module, procedure )
838838
!! The name of the procedure contining the current invocation of
839839
!! `log_information`
840840

841-
if ( self % level > stdlib_debug_level) return
841+
if ( self % level > debug_level ) return
842842

843843
call self % log_message( message, &
844844
module = module, &
@@ -911,7 +911,7 @@ subroutine log_error( self, message, module, procedure, stat, errmsg )
911911
character(*), parameter :: procedure_name = 'log_error'
912912
character(:), allocatable :: suffix
913913

914-
if ( self % level > stdlib_error_level) return
914+
if ( self % level > error_level ) return
915915

916916
if ( present(stat) ) then
917917
write( dummy, '(a, i0)', err=999, iostat=iostat, iomsg=iomsg ) &
@@ -993,7 +993,7 @@ subroutine log_information( self, message, module, procedure )
993993
!! The name of the procedure contining the current invocation of
994994
!! `log_information`
995995

996-
if ( self % level > stdlib_information_level) return
996+
if ( self % level > information_level ) return
997997

998998
call self % log_message( message, &
999999
module = module, &
@@ -1057,7 +1057,7 @@ subroutine log_io_error( self, message, module, procedure, iostat, &
10571057
character(*), parameter :: procedure_name = 'log_io_error'
10581058
character(:), allocatable :: suffix
10591059

1060-
if ( self % level > stdlib_io_error_level) return
1060+
if ( self % level > io_error_level ) return
10611061

10621062
if ( present(iostat) ) then
10631063
write( dummy, '(a, i0)', err=999, iostat=iostat2, iomsg=iomsg2 ) &
@@ -1277,7 +1277,7 @@ subroutine log_text_error( self, line, column, summary, filename, &
12771277
character(*), parameter :: procedure_name = 'LOG_TEXT_ERROR'
12781278
character(len=:), allocatable :: buffer
12791279

1280-
if ( self % level > stdlib_text_error_level) return
1280+
if ( self % level > text_error_level ) return
12811281

12821282
acaret = optval(caret, '^')
12831283

src/tests/logger/test_stdlib_logger.f90

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,9 @@ subroutine test_level()
654654

655655
print *, 'running test_level'
656656

657-
658657
call global % configure( level = stdlib_all_level )
659658

660-
call global % configuration( level = level)
659+
call global % configuration( level = level )
661660
if ( level == stdlib_all_level ) then
662661
write(*,*) 'LEVEL is stdlib_all_level as expected.'
663662

@@ -675,12 +674,9 @@ subroutine test_level()
675674
call global % log_error( 'This message should be printed')
676675
call global % log_io_error( 'This message should be printed')
677676

678-
679-
680-
681677
call global % configure( level = stdlib_debug_level )
682678

683-
call global % configuration( level = level)
679+
call global % configuration( level = level )
684680
if ( level == stdlib_debug_level ) then
685681
write(*,*) 'LEVEL is stdlib_debug_level as expected.'
686682

@@ -698,12 +694,9 @@ subroutine test_level()
698694
call global % log_error( 'This message should be printed')
699695
call global % log_io_error( 'This message should be printed')
700696

701-
702-
703-
704697
call global % configure( level = stdlib_information_level )
705698

706-
call global % configuration( level = level)
699+
call global % configuration( level = level )
707700
if ( level == stdlib_information_level ) then
708701
write(*,*) 'LEVEL is stdlib_information_level as expected.'
709702

@@ -721,12 +714,9 @@ subroutine test_level()
721714
call global % log_error( 'This message should be printed')
722715
call global % log_io_error( 'This message should be printed')
723716

724-
725-
726-
727717
call global % configure( level = stdlib_warning_level )
728718

729-
call global % configuration( level = level)
719+
call global % configuration( level = level )
730720
if ( level == stdlib_warning_level ) then
731721
write(*,*) 'LEVEL is stdlib_warning_level as expected.'
732722

@@ -744,12 +734,9 @@ subroutine test_level()
744734
call global % log_error( 'This message should be printed')
745735
call global % log_io_error( 'This message should be printed')
746736

747-
748-
749-
750737
call global % configure( level = stdlib_error_level )
751738

752-
call global % configuration( level = level)
739+
call global % configuration( level = level )
753740
if ( level == stdlib_error_level ) then
754741
write(*,*) 'LEVEL is stdlib_error_level as expected.'
755742

@@ -767,12 +754,9 @@ subroutine test_level()
767754
call global % log_error( 'This message should be printed')
768755
call global % log_io_error( 'This message should be printed')
769756

770-
771-
772-
773757
call global % configure( level = stdlib_none_level )
774758

775-
call global % configuration( level = level)
759+
call global % configuration( level = level )
776760
if ( level == stdlib_none_level ) then
777761
write(*,*) 'LEVEL is stdlib_none_level as expected.'
778762

@@ -787,13 +771,11 @@ subroutine test_level()
787771
call global % log_debug( 'This message should NOT be printed')
788772
call global % log_information( 'This message should NOT be printed')
789773
call global % log_warning( 'This message should NOT be printed')
790-
call global % log_error( 'This message should be NOT printed')
774+
call global % log_error( 'This message should NOT be printed')
791775
call global % log_io_error( 'This message should NOT be printed')
792776

793-
794777
print *, 'end of test_level'
795778

796-
797779
end subroutine test_level
798780

799781
end program test_stdlib_logger

0 commit comments

Comments
 (0)