Skip to content

Commit

Permalink
Merge pull request #2212 from dtcenter/feature_2211_log_msg
Browse files Browse the repository at this point in the history
Feature #2211 log_msg
  • Loading branch information
jvigh committed Jul 27, 2022
2 parents 8f6f304 + b9c5899 commit 5f1899a
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions src/basic/vx_config/dictionary.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1949,7 +1949,8 @@ if ( Entry ) {

mlog << Warning
<< "\nDictionary::lookup_thresh() -> "
<< "threshold lookup failed for name \"" << name << "\"\n\n";
<< "threshold lookup failed for name \""
<< name << "\"\n\n";

}
}
Expand All @@ -1962,7 +1963,9 @@ if ( !Entry || !is_correct_type ) {

mlog << Error
<< "\nDictionary::lookup_thresh() -> "
<< "lookup failed for name \"" << name << "\"\n\n";
<< "threshold \"" << name
<< "\" must start with a valid comparison operator "
<< "(<, <=, ==, !=, >, >=, lt, le, eq, ne, gt, ge).\n\n";

exit ( 1 );

Expand Down Expand Up @@ -2008,7 +2011,6 @@ if ( Entry ) {
}
}


LastLookupStatus = is_correct_type;

if ( !Entry || !is_correct_type ) {
Expand All @@ -2017,7 +2019,9 @@ if ( !Entry || !is_correct_type ) {

mlog << Error
<< "\nDictionary::lookup_thresh_array() -> "
<< "lookup failed for name \"" << name << "\"\n\n";
<< "each threshold in array \"" << name
<< "\" must start with a valid comparison operator "
<< "(<, <=, ==, !=, >, >=, lt, le, eq, ne, gt, ge).\n\n";

exit ( 1 );

Expand Down Expand Up @@ -2056,8 +2060,9 @@ if ( Dict->n_entries() > 0 ) {

mlog << Error
<< "\nDictionary::lookup_thresh_array() -> "
<< "array \"" << name
<< "\" does not contain ThreshType.\n\n";
<< "each threshold in array \"" << name
<< "\" must start with a valid comparison operator "
<< "(<, <=, ==, !=, >, >=, lt, le, eq, ne, gt, ge).\n\n";

exit ( 1 );

Expand Down

0 comments on commit 5f1899a

Please sign in to comment.