Changeset 1217

Timestamp:

03/08/10 09:29:16 (2 years ago)

Author:

Gary

Message:

unxsBind working on master and slave jobqueue processing changes for logfileLine().

Files:

• trunk/unxsBind/bind.c (modified) (18 diffs)

trunk/unxsBind/bind.c

@@ -20 +20 @@
 //Local data
 //
-static FILE *gLfp;
+static FILE *gLfp=NULL;
 static unsigned uReconfig=0;
 static unsigned uReload=0;
@@ -79 +79 @@
         pid_t pidThis;
         const struct tm *tmTime;
+
+        if(gLfp==NULL) return;
 
         pidThis=getpid();
@@ -604 +606 @@
         if(cuGID[0]) sscanf(cuGID,"%u",&uGID);
 
-        fprintf(stdout,"CreateSlaveFiles(%s)\n",cSlaveNS);
+        //debug only
+        //fprintf(stdout,"CreateSlaveFiles(%s)\n",cSlaveNS);
 
         sprintf(gcQuery,"SELECT DISTINCT tZone.cZone,tView.cLabel,tView.cSlave,tView.uView,tNSSet.cMasterIPs,"
@@ -623 +626 @@
         if(mysql_num_rows(res)<1) 
         {
-                fprintf(stdout,"No zones found for slave NS %s\n",cSlaveNS);
+                logfileLine("CreateSlaveFiles","No zones found for slave");
                 return;
         }
@@ -631 +634 @@
                 if(!(fp=fopen("/usr/local/idns/named.d/slave.zones","w")))
                 {
-                        fprintf(stderr,"Could not open slave.zones\n");
+                        logfileLine("CreateSlaveFiles","Could not open slave.zones");
                         exit(1);
                 }
@@ -897 +900 @@
         unsigned uChanged=0;
 
+#ifdef cLOGFILE
+        if((gLfp=fopen(cLOGFILE,"a"))==NULL)
+        {
+                fprintf(stderr,"Could not open logfile: %s\n",cLOGFILE);
+                exit(300);
+        }
+#else
+        gLfp=stdout;
+#endif
+        
+        ConnectDb();
+
+
         ConnectDb();
         
@@ -920 +936 @@
                                         " cTargetServer LIKE '%% MASTER EXTERNAL'",field[3]);
                         mysql_query(&gMysql,gcQuery);
+                        //debug only
                         //fprintf(stdout,"%s\n",gcQuery);
                         if(mysql_errno(&gMysql)) 
@@ -937 +954 @@
                                         exit(1);
                                 }
-                                fprintf(stdout,"Deleted MASTER EXTERNAL job, and continuing ahead\n");
+                                logfileLine("SlaveJobQueue","Deleted MASTER EXTERNAL job");
                         }
                         mysql_free_result(res2);
@@ -945 +962 @@
                                         " cTargetServer LIKE '%% MASTER%%'",field[3]);//3-uMasterJob
                         mysql_query(&gMysql,gcQuery);
+                        //debug only
                         //fprintf(stdout,"%s\n",gcQuery);
                         if(mysql_errno(&gMysql)) 
@@ -952 +970 @@
                         }
                         res2=mysql_store_result(&gMysql);
-                        if(mysql_num_rows(res2)) 
+                        if(mysql_num_rows(res2)>0) 
                         {
                                 mysql_free_result(res2);
                                 //Ignore this job until 'REAL' MASTER
                                 //handles it.
-                                fprintf(stdout,"Skipping job not yet handled by MASTER\n");
+                                logfileLine("SlaveJobQueue","Skipping job not yet handled by MASTER");
+                                //debug only
+                                //fprintf(stdout,"d1 %s\n",field[2]);
                                 continue;
                         }
+                        //debug only
+                        //fprintf(stdout,"d2 %s\n",field[2]);
                         mysql_free_result(res2);
                         
@@ -984 +1006 @@
                                 strcpy(cCurrentZone,field[2]);
                         }
-                        fprintf(stdout,"%s\t%s\t%s\n",field[0],field[2],field[1]);
+                        //debug only
+                        //fprintf(stdout,"%s\t%s\t%s\n",field[0],field[2],field[1]);
                         //Allow for combinations: Modify New, Delete New. Modify overrides a Delete.
                         if(strstr(field[1],"New")) uNew++;
@@ -1004 +1027 @@
                 }
         }
+        mysql_free_result(res);
 
         if(!first)
@@ -1013 +1037 @@
                                 uNew,uDeleteFirst,cNameServer,cMasterIP);
         }
-        mysql_free_result(res);
         
         if(uChanged)
@@ -1199 +1222 @@
                         unsigned uNew,unsigned uDeleteFirst,char *cMasterNS)
 {
+
+        sprintf(gcQuery,"cZone=%.99s;cMasterNS=%.99s;",cZone,cMasterNS);
+        logfileLine("ProcessMasterJob",gcQuery);
         //return 0 if nothing needs to be done
         //return 1 if zone info has changed
@@ -1260 +1286 @@
         //debug only
         //fprintf(stdout,"Queue Policy for %s: ",cZone);
+        sprintf(gcQuery,"cZone=%.99s;cNS=%.99s;cIP=%.32s;",cZone,cMasterNS,cMasterIP);
+        logfileLine("ProcessSlaveJob",gcQuery);
         if(uDelete && !uNew)
         {
                 //debug only
-                fprintf(stdout,"Delete for NS %s\n\n",cMasterNS);
+                //fprintf(stdout,"Delete for NS %s\n\n",cMasterNS);
+                logfileLine("ProcessSlaveJob","Delete");
                 //Replace slave.zones named.conf include file
                 //All Zones replace
@@ -1272 +1301 @@
         {
                 //debug only
-                fprintf(stdout,"New then Delete\n\n");
+                //fprintf(stdout,"New then Delete\n\n");
+                logfileLine("ProcessSlaveJob","New+Delete Ignored");
                 return(0);
         }
@@ -1279 +1309 @@
                 //debug only
                 if(uNew)
-                        fprintf(stdout,"Modify New for NS %s\n\n",cMasterNS);
+                        logfileLine("ProcessSlaveJob","New+Modify");
                 else
-                        fprintf(stdout,"Modify for NS %s\n\n",cMasterNS);
+                        logfileLine("ProcessSlaveJob","Modify");
                 CreateSlaveFiles(cMasterNS,"",cMasterIP,0);
                 if(cuControlPort[0])
@@ -1296 +1326 @@
         {
                 //debug only
-                fprintf(stdout,"New for NS %s\n\n",cMasterNS);
+                logfileLine("ProcessSlaveJob","New");
                 //Append to slave.zones named.conf include file
                 //Single zone append