Changeset 1216

Timestamp:

03/08/10 08:47:29 (2 years ago)

Author:

Gary

Message:

unxsBind started work on cleaning up jobqueue processing logging.

Files:

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

trunk/unxsBind/bind.c

@@ -86 +86 @@
         strftime(cTime,31,"%b %d %T",tmTime);
 
-        fprintf(gLfp,"%s jobqueue.%s[%u]: %s\n",cTime,cFunction,pidThis,cLogline);
+        fprintf(gLfp,"%s unxsBind.%s[%u]: %s\n",cTime,cFunction,pidThis,cLogline);
         fflush(gLfp);
 
@@ -969 +969 @@
                                 {
                                         //debug only
-                                        fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
-                                                uDelete,uModify,uNew,uDeleteFirst); 
+                                        //fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
+                                        //      uDelete,uModify,uNew,uDeleteFirst); 
                                         uChanged+=ProcessSlaveJob(cCurrentZone,uDelete,uModify,
                                                         uNew,uDeleteFirst,cNameServer,cMasterIP);
@@ -1008 +1008 @@
         {
                 //debug only
-                fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
-                                                uDelete,uModify,uNew,uDeleteFirst); 
+                //fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
+                //                              uDelete,uModify,uNew,uDeleteFirst); 
                 uChanged+=ProcessSlaveJob(cCurrentZone,uDelete,uModify,
                                 uNew,uDeleteFirst,cNameServer,cMasterIP);
@@ -1027 +1027 @@
                 if((uNamedCheckConf(cNameServer))) exit(1); //Exit without reloading the server
                 if(cuControlPort[0])
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig",gcBinDir,cuControlPort);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig > /dev/null 2>&1",
+                                gcBinDir,cuControlPort);
                 else
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reconfig",gcBinDir);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reconfig > /dev/null 2>&1",gcBinDir);
                 
                 if(system(cCmd))
@@ -1057 +1058 @@
         char cCmd[100]={""};
 
+#ifdef cLOGFILE
         if((gLfp=fopen(cLOGFILE,"a"))==NULL)
         {
@@ -1062 +1064 @@
                 exit(300);
         }
+#else
+        gLfp=stdout;
+#endif
         
         ConnectDb();
@@ -1091 +1096 @@
                                 {
                                         //debug only
-                                        fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
-                                                uDelete,uModify,uNew,uDeleteFirst); 
+                                        //fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
+                                        //      uDelete,uModify,uNew,uDeleteFirst); 
                                         uChanged+=ProcessMasterJob(cCurrentZone,uDelete,uModify,
                                                 uNew,uDeleteFirst,cNameServer);
@@ -1107 +1112 @@
                                 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++;
@@ -1141 +1147 @@
                 }
         }
+        mysql_free_result(res);
 
         if(!first)
         {
                 //debug only
-                fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
-                                                uDelete,uModify,uNew,uDeleteFirst); 
+                //fprintf(stdout,"uDelete=%u uModify=%u uNew=%u uDeleteFirst=%u\n",
+                //                              uDelete,uModify,uNew,uDeleteFirst); 
                 if((uChanged=ProcessMasterJob(cCurrentZone,uDelete,uModify,
                                 uNew,uDeleteFirst,cNameServer)))
@@ -1156 +1163 @@
                 }
         }
-//      mysql_free_result(res);
 
         if(uReload)
@@ -1162 +1168 @@
                 if((uNamedCheckConf(cNameServer))) exit(1); //Will exit without server reload or reconfig
                 if(cuControlPort[0])
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload",gcBinDir,cuControlPort);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload > /dev/null 2>&1",
+                                gcBinDir,cuControlPort);
                 else
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload",gcBinDir);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload > /dev/null 2>&1",gcBinDir);
                 
                 if(system(cCmd))
@@ -1173 +1180 @@
                 if((uNamedCheckConf(cNameServer))) exit(1); //Will exit without server reload or reconfig
                 if(cuControlPort[0])
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig",gcBinDir,cuControlPort);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reconfig > /dev/null 2>&1",
+                                gcBinDir,cuControlPort);
                 else
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reconfig",gcBinDir);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reconfig > /dev/null 2>&1",gcBinDir);
                 
                 if(system(cCmd))
@@ -1188 +1196 @@
 
 
-int ProcessMasterJob(char *cZone,unsigned uDelete,unsigned uModify,unsigned uNew, unsigned uDeleteFirst, char *cMasterNS)
+int ProcessMasterJob(char *cZone,unsigned uDelete,unsigned uModify,
+                        unsigned uNew,unsigned uDeleteFirst,char *cMasterNS)
 {
         //return 0 if nothing needs to be done
@@ -1195 +1204 @@
         //return 3 if zone is modified but we need a reload anyway
         //debug only
-        fprintf(stdout,"Queue Policy for %s: ",cZone);
+        //fprintf(stdout,"Queue Policy for %s: ",cZone);
         if(uDelete && !uNew)
         {
-                //debug only
-                fprintf(stdout,"Delete for NS %s\n\n",cMasterNS);
+                logfileLine("ProcessMasterJob","Delete");
                 //Replace master.zones named.conf include file
                 //All Zones replace, DBFiles No, Stubs Yes
@@ -1207 +1215 @@
         else if(uDelete && uNew && !uDeleteFirst)
         {
-                //debug only
-                fprintf(stdout,"New then Delete\n\n");
+                logfileLine("ProcessMasterJob","New then Delete");
                 return(0);
         }
@@ -1215 +1222 @@
                 //debug only
                 if(uModify)
-                        fprintf(stdout,"New Modify for NS %s\n\n",cMasterNS);
+                        logfileLine("ProcessMasterJob","New+Modify");
                 else
-                        fprintf(stdout,"New for NS %s\n\n",cMasterNS);
+                        logfileLine("ProcessMasterJob","New");
                 //Append to master.zones named.conf include file
                 //Single zone append, DBFiles yes, Stubs yes
@@ -1226 +1233 @@
         {
                 //debug only
-                fprintf(stdout,"Modify for NS %s\n\n",cMasterNS);
+                logfileLine("ProcessMasterJob","Modify");
                 //Single zone, DBFiles yes, Stubs yes
                 //We will always build stubs when modyfing a zone
@@ -1252 +1259 @@
         
         //debug only
-        fprintf(stdout,"Queue Policy for %s: ",cZone);
+        //fprintf(stdout,"Queue Policy for %s: ",cZone);
         if(uDelete && !uNew)
         {
@@ -1277 +1284 @@
                 CreateSlaveFiles(cMasterNS,"",cMasterIP,0);
                 if(cuControlPort[0])
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload",gcBinDir,cuControlPort);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload > /dev/null 2>&1",
+                                gcBinDir,cuControlPort);
                 else
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload",gcBinDir);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload > /dev/null 2>&1",gcBinDir);
                 system(cCmd);
                 
@@ -1294 +1302 @@
                 //This is a hack has to be optimized further
                 if(cuControlPort[0])
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload",gcBinDir,cuControlPort);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload > /dev/null 2>&1",
+                                gcBinDir,cuControlPort);
                 else
-                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload",gcBinDir);
+                        sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload > /dev/null 2>&1",gcBinDir);
                 system(cCmd);
                 ViewReloadZone(cZone);
@@ -1583 +1592 @@
                 {
                         if(cuControlPort[0])
-                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s retransfer %s in %s",
+                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s retransfer %s in %s > /dev/null 2>&1",
                                                 gcBinDir,cuControlPort,cZone,field[0]);
                         else
-                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf retransfer %s in %s",
+                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf retransfer %s in %s > /dev/null 2>&1",
                                                 gcBinDir,cZone,field[0]);
                 }
@@ -1592 +1601 @@
                 {
                         if(cuControlPort[0])
-                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload %s in %s",
+                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf -p %s reload %s in %s > /dev/null 2>&1",
                                                 gcBinDir,cuControlPort,cZone,field[0]);
                         else
-                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload %s in %s",
+                                sprintf(cCmd,"%s/rndc -c /etc/unxsbind-rndc.conf reload %s in %s > /dev/null 2>&1",
                                                 gcBinDir,cZone,field[0]);
                 }
                 //debug only
-                fprintf(stdout,"ViewReloadZone():%s\n",cCmd);
+                //fprintf(stdout,"ViewReloadZone():%s\n",cCmd);
                 uRetVal=system(cCmd);
         }