[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r4086 - trunk/OpenDNSSEC/signer/src/daemon

Matthijs Mekking matthijs at nlnetlabs.nl
Tue Oct 12 15:12:17 CEST 2010


Author: matthijs
Date: 2010-10-12 15:12:17 +0200 (Tue, 12 Oct 2010)
New Revision: 4086

Modified:
   trunk/OpenDNSSEC/signer/src/daemon/cmdhandler.c
Log:
tweak feedback message here



Modified: trunk/OpenDNSSEC/signer/src/daemon/cmdhandler.c
===================================================================
--- trunk/OpenDNSSEC/signer/src/daemon/cmdhandler.c	2010-10-12 12:54:38 UTC (rev 4085)
+++ trunk/OpenDNSSEC/signer/src/daemon/cmdhandler.c	2010-10-12 13:12:17 UTC (rev 4086)
@@ -217,6 +217,7 @@
         while (node && node != LDNS_RBTREE_NULL) {
             task = (task_type*) node->key;
             if (se_strcmp(tbd, task->who) == 0) {
+                found = 1;
                 task = tasklist_delete_task(cmdc->engine->tasklist, task);
                 if (!task) {
                     se_log_error("cannot immediate sign zone %s: delete old "
@@ -233,7 +234,6 @@
                     if (task) {
                        scheduled = 1;
                     }
-                    found = 1;
                 }
                 break;
             }
@@ -266,17 +266,17 @@
             worker_wakeup(cmdc->engine->workers[i]);
         }
     } else if (found && !scheduled) {
-        (void)snprintf(buf, ODS_SE_MAXLINE, "Zone %s not scheduled, "
-            "already being signed right now!\n", tbd?tbd:"(null)");
+        (void)snprintf(buf, ODS_SE_MAXLINE, "Failed to schedule signing for "
+             "zone %s\n", tbd?tbd:"(null)");
         se_writen(sockfd, buf, strlen(buf));
-        se_log_warning("cmdhandler: zone %s was found in zone list but not in "
-            "task queue", tbd?tbd:"(null)");
+        se_log_error("cmdhandler: zone %s was found in task queu but "
+            "rescheduling failed", tbd?tbd:"(null)");
     } else {
-        (void)snprintf(buf, ODS_SE_MAXLINE, "Zone %s not being signed yet, "
-            "updating sign configuration\n", tbd?tbd:"(null)");
+        (void)snprintf(buf, ODS_SE_MAXLINE, "Zone %s not in task queue, "
+            "\n", tbd?tbd:"(null)");
         se_writen(sockfd, buf, strlen(buf));
-        se_log_warning("cmdhandler: zone %s not found in zone list, updating "
-            "zone list", tbd?tbd:"(null)");
+        se_log_warning("cmdhandler: zone %s not found in zone list",
+            tbd?tbd:"(null)");
         cmdhandler_handle_cmd_update(sockfd, cmdc, tbd);
     }
     return;




More information about the Opendnssec-commits mailing list