BIND 10 track2046, updated. 71c5bdbe0993f0f1df977f7ac89e0eda9b3526c9 [1976] Issue a warning when not loading zones

[BIND 10 source code commits]

The branch, track2046 has been updated
       via  71c5bdbe0993f0f1df977f7ac89e0eda9b3526c9 (commit)
      from  7d3bb3bf33a847c65749a9e38d07649579702055 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 71c5bdbe0993f0f1df977f7ac89e0eda9b3526c9
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri Jul 6 15:08:20 2012 +0200

    [1976] Issue a warning when not loading zones

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/client_list.cc       |   10 ++++++++++
 src/lib/datasrc/datasrc_messages.mes |    7 +++++++
 2 files changed, 17 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index ae304ce..e9718d4 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -16,6 +16,7 @@
 #include "client.h"
 #include "factory.h"
 #include "memory_datasrc.h"
+#include "logger.h"
 
 #include <memory>
 #include <boost/foreach.hpp>
@@ -74,6 +75,15 @@ ConfigurableClientList::configure(const Element& config, bool allow_cache) {
                 // In case the cache is not allowed, we just skip the master
                 // files (at least for now)
                 if (!allow_cache) {
+                    // We're not going to load these zones. Issue warnings about it.
+                    const map<string, ConstElementPtr>
+                        zones_files(paramConf->mapValue());
+                    for (map<string, ConstElementPtr>::const_iterator
+                         it(zones_files.begin()); it != zones_files.end();
+                         ++it) {
+                        LOG_WARN(logger, DATASRC_LIST_NOT_CACHED).
+                            arg(it->first).arg(rrclass_);
+                    }
                     continue;
                 }
                 if (!want_cache) {
diff --git a/src/lib/datasrc/datasrc_messages.mes b/src/lib/datasrc/datasrc_messages.mes
index 7e3d5c2..6ae744e 100644
--- a/src/lib/datasrc/datasrc_messages.mes
+++ b/src/lib/datasrc/datasrc_messages.mes
@@ -298,6 +298,13 @@ not contain RRs the requested type.  AN NXRRSET indication is returned.
 A debug message indicating that a query for the given name and RR type is being
 processed.
 
+% DATASRC_LIST_NOT_CACHED zone %1/%2 not cached, cache disabled globally. Will not be available.
+The process disabled caching of RR data completely. However, the given zone
+is provided as a master file and it can be served from memory cache only.
+Therefore, the zone will not be available for this process. If this is
+a problem, you should move the zone to some database backend (sqlite3, for
+example) and use it from there.
+
 % DATASRC_MEM_ADD_RRSET adding RRset '%1/%2' into zone '%3'
 Debug information. An RRset is being added to the in-memory data source.