| @@ -1,182 +0,0 @@
-Index: pdns/backends/gsql/gsqlbackend.cc
-===================================================================
---- pdns/backends/gsql/gsqlbackend.cc (.../trunk/pdns-3.1-rc2) (revision 8)
-+++ pdns/backends/gsql/gsqlbackend.cc (.../branches/pdns-3.1-rc2-slavedb) (revision 8)
-@@ -78,7 +78,7 @@
- d_MasterOfDomainsZoneQuery.c_str(),
- sqlEscape(domain).c_str());
- try {
-- d_db->doQuery(output, d_result);
-+ getDBReadonly()->doQuery(output, d_result);
- }
- catch (SSqlException &e) {
- throw AhuException("GSQLBackend unable to retrieve list of master domains: "+e.txtReason());
-@@ -111,7 +111,7 @@
- snprintf(output,sizeof(output)-1,d_InfoOfDomainsZoneQuery.c_str(),
- sqlEscape(domain).c_str());
- try {
-- d_db->doQuery(output,d_result);
-+ getDBReadonly()->doQuery(output,d_result);
- }
- catch(SSqlException &e) {
- throw AhuException("GSQLBackend unable to retrieve information about a domain: "+e.txtReason());
-@@ -156,7 +156,7 @@
- /* list all domains that need refreshing for which we are slave, and insert into SlaveDomain:
- id,name,master IP,serial */
- try {
-- d_db->doQuery(d_InfoOfAllSlaveDomainsQuery, d_result);
-+ getDBReadonly()->doQuery(d_InfoOfAllSlaveDomainsQuery, d_result);
- }
- catch (SSqlException &e) {
- throw AhuException("GSQLBackend unable to retrieve list of slave domains: "+e.txtReason());
-@@ -192,7 +192,7 @@
- /* list all domains that need notifications for which we are master, and insert into updatedDomains
- id,name,master IP,serial */
- try {
-- d_db->doQuery(d_InfoOfAllMasterDomainsQuery,d_result);
-+ getDBReadonly()->doQuery(d_InfoOfAllMasterDomainsQuery,d_result);
- }
- catch(SSqlException &e) {
- throw AhuException("GSQLBackend unable to retrieve list of master domains: "+e.txtReason());
-@@ -243,6 +243,7 @@
- {
- setArgPrefix(mode+suffix);
- d_db=0;
-+ d_db_slave=NULL;
- d_logprefix="["+mode+"Backend"+suffix+"] ";
-
- try
-@@ -529,7 +530,7 @@
- snprintf(output,sizeof(output)-1,d_GetDomainMetadataQuery.c_str(), sqlEscape(name).c_str(), sqlEscape(kind).c_str());
-
- try {
-- d_db->doQuery(output);
-+ getDBReadonly()->doQuery(output);
- }
- catch (SSqlException &e) {
- throw AhuException("GSQLBackend unable to list metadata: "+e.txtReason());
-@@ -619,7 +620,7 @@
- DLOG(L<< "Query: '" << output << "'"<<endl);
-
- try {
-- d_db->doQuery(output);
-+ getDBReadonly()->doQuery(output);
- }
- catch(SSqlException &e) {
- throw AhuException(e.txtReason());
-@@ -637,7 +638,7 @@
- char output[1024];
- snprintf(output,sizeof(output)-1,d_listQuery.c_str(),domain_id);
- try {
-- d_db->doQuery(output);
-+ getDBReadonly()->doQuery(output);
- }
- catch(SSqlException &e) {
- throw AhuException("GSQLBackend list query: "+e.txtReason());
-@@ -657,7 +658,7 @@
- for(vector<DNSResourceRecord>::const_iterator i=nsset.begin();i!=nsset.end();++i) {
- try {
- snprintf(output,sizeof(output)-1,format.c_str(),sqlEscape(ip).c_str(),sqlEscape(i->content).c_str());
-- d_db->doQuery(output, d_result);
-+ getDBReadonly()->doQuery(output, d_result);
- }
- catch (SSqlException &e) {
- throw AhuException("GSQLBackend unable to search for a domain: "+e.txtReason());
-@@ -734,7 +735,7 @@
- {
- // L << "GSQLBackend get() was called for "<<qtype.getName() << " record: ";
- SSql::row_t row;
-- if(d_db->getRow(row)) {
-+ if(getDBReadonly()->getRow(row)) {
- r.content=row[0];
- if (row[1].empty())
- r.ttl = ::arg().asNum( "default-ttl" );
-@@ -831,7 +832,7 @@
- sd.domain_id);
-
- try {
-- d_db->doQuery(output, d_result);
-+ getDBReadonly()->doQuery(output, d_result);
- }
- catch (const SSqlException& e) {
- //DLOG(L<<"GSQLBackend unable to calculate SOA serial: " << e.txtReason()<<endl);
-Index: pdns/backends/gsql/gsqlbackend.hh
-===================================================================
---- pdns/backends/gsql/gsqlbackend.hh (.../trunk/pdns-3.1-rc2) (revision 8)
-+++ pdns/backends/gsql/gsqlbackend.hh (.../branches/pdns-3.1-rc2-slavedb) (revision 8)
-@@ -15,12 +15,24 @@
- {
- if(d_db)
- delete d_db;
-+ if(d_db_slave)
-+ delete d_db_slave;
- }
-
- void setDB(SSql *db)
- {
- d_db=db;
- }
-+
-+ void setDBReadonly(SSql *db)
-+ {
-+ d_db_slave=db;
-+ }
-+
-+ SSql *getDBReadonly()
-+ {
-+ return d_db_slave != NULL ? d_db_slave : d_db;
-+ }
-
- virtual string sqlEscape(const string &name);
- void lookup(const QType &, const string &qdomain, DNSPacket *p=0, int zoneId=-1);
-@@ -62,6 +74,7 @@
- QType d_qtype;
- int d_count;
- SSql *d_db;
-+ SSql *d_db_slave;
- SSql::result_t d_result;
-
- string d_wildCardNoIDQuery;
-Index: modules/gmysqlbackend/gmysqlbackend.cc
-===================================================================
---- modules/gmysqlbackend/gmysqlbackend.cc (.../trunk/pdns-3.1-rc2) (revision 8)
-+++ modules/gmysqlbackend/gmysqlbackend.cc (.../branches/pdns-3.1-rc2-slavedb) (revision 8)
-@@ -35,6 +35,24 @@
- throw AhuException("Unable to launch "+mode+" connection: "+e.txtReason());
- }
- L<<Logger::Warning<<mode<<" Connection successful"<<endl;
-+
-+ if(!getArg("slave-socket").empty() || !getArg("slave-host").empty()) {
-+ try {
-+ setDBReadonly(new SMySQL(getArg("slave-dbname"),
-+ getArg("slave-host"),
-+ getArgAsNum("slave-port"),
-+ getArg("slave-socket"),
-+ getArg("slave-user"),
-+ getArg("slave-password")));
-+ L<<Logger::Warning<<mode<<" Slave connection successful."<<endl;
-+ } catch(ArgException &e) {
-+ // Ignore exception, slave not
-+ L<<Logger::Warning<<mode<<" Slave configuration."<<endl;
-+ } catch(SSqlException &e) {
-+ // Ignore exception, slave not
-+ L<<Logger::Warning<<mode<<" Unable to connect to slave."<<endl;
-+ }
-+ }
- }
-
- class gMySQLFactory : public BackendFactory
-@@ -52,6 +70,13 @@
- declare(suffix,"password","Pdns backend password to connect with","");
- declare(suffix,"dnssec","Assume DNSSEC Schema is in place","no");
-
-+ declare(suffix,"slave-dbname","Pdns backend database name to connect to","");
-+ declare(suffix,"slave-user","Database backend user to connect as","");
-+ declare(suffix,"slave-host","Database backend host to connect to","");
-+ declare(suffix,"slave-port","Database backend port to connect to","0");
-+ declare(suffix,"slave-socket","Pdns backend socket to connect to","");
-+ declare(suffix,"slave-password","Pdns backend password to connect with","");
-+
- declare(suffix,"basic-query","Basic query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s'");
- declare(suffix,"id-query","Basic with ID query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name='%s' and domain_id=%d");
- declare(suffix,"wildcard-query","Wildcard query","select content,ttl,prio,type,domain_id,name from records where type='%s' and name like '%s'");
|
