Browse Source

[2436] Tweak log messages

And their IDs. Just slight clarifications.
Michal 'vorner' Vaner 12 years ago
parent
commit
ba7d30083a
2 changed files with 15 additions and 13 deletions
  1. 13 11
      src/lib/datasrc/datasrc_messages.mes
  2. 2 2
      src/lib/datasrc/zone_loader.cc

+ 13 - 11
src/lib/datasrc/datasrc_messages.mes

@@ -70,6 +70,19 @@ The maximum allowed number of items of the hotspot cache is set to the given
 number. If there are too many, some of them will be dropped. The size of 0
 number. If there are too many, some of them will be dropped. The size of 0
 means no limit.
 means no limit.
 
 
+% DATASRC_CHECK_ERROR post-load check of zone %1/%2 failed: %3
+The zone was loaded into the data source successfully, but the content fails
+basic sanity checks. See the message if you want to know what exactly is wrong
+with the data. The data can not be used and previous version, if any, will be
+preserved.
+
+% DATASRC_CHECK_WARNING %1/%2: %3
+The zone was loaded into the data source successfully, but there's some problem
+with the content. The problem does not stop the new version from being used
+(though there may be other problems that do, see DATASRC_CHECK_ERROR),
+but it should still be checked and fixed. See the message to know what exactly
+is wrong with the data.
+
 % DATASRC_DATABASE_COVER_NSEC_UNSUPPORTED %1 doesn't support DNSSEC when asked for NSEC data covering %2
 % DATASRC_DATABASE_COVER_NSEC_UNSUPPORTED %1 doesn't support DNSSEC when asked for NSEC data covering %2
 The datasource tried to provide an NSEC proof that the named domain does not
 The datasource tried to provide an NSEC proof that the named domain does not
 exist, but the database backend doesn't support DNSSEC. No proof is included
 exist, but the database backend doesn't support DNSSEC. No proof is included
@@ -844,14 +857,3 @@ data source.
 % DATASRC_UNEXPECTED_QUERY_STATE unexpected query state
 % DATASRC_UNEXPECTED_QUERY_STATE unexpected query state
 This indicates a programming error. An internal task of unknown type was
 This indicates a programming error. An internal task of unknown type was
 generated.
 generated.
-
-% DATASRC_VALIDATE_ERROR validation of zone %1/%2 failed: %3
-The zone was loaded into the data source successfully, but the content fails
-basic sanity checks. See the message if you want to know what exactly is wrong
-with the data. The data can not be used and previous version, if any, will be
-preserved.
-
-% DATASRC_VALIDATE_WARNING %1/%2: %3
-The zone was loaded, but there's some problem with the content. The problem
-is not serious enough to make the zone unusable, but it should still be checked
-and fixed. See the message to know what exactly is wrong with the data.

+ 2 - 2
src/lib/datasrc/zone_loader.cc

@@ -110,7 +110,7 @@ void
 logWarning(const dns::Name* zone_name, const dns::RRClass* rrclass,
 logWarning(const dns::Name* zone_name, const dns::RRClass* rrclass,
            const std::string& reason)
            const std::string& reason)
 {
 {
-    LOG_WARN(logger, DATASRC_VALIDATE_WARNING).arg(*zone_name).arg(*rrclass).
+    LOG_WARN(logger, DATASRC_CHECK_WARNING).arg(*zone_name).arg(*rrclass).
         arg(reason);
         arg(reason);
 }
 }
 
 
@@ -118,7 +118,7 @@ void
 logError(const dns::Name* zone_name, const dns::RRClass* rrclass,
 logError(const dns::Name* zone_name, const dns::RRClass* rrclass,
          const std::string& reason)
          const std::string& reason)
 {
 {
-    LOG_ERROR(logger, DATASRC_VALIDATE_ERROR).arg(*zone_name).arg(*rrclass).
+    LOG_ERROR(logger, DATASRC_CHECK_ERROR).arg(*zone_name).arg(*rrclass).
         arg(reason);
         arg(reason);
 }
 }