Changeset 270 for trunk

Timestamp:

Jan 8, 2010, 6:32:36 PM (15 years ago)

Author:

katerina

Message:

Fix bug with tracking of client reload status (ticket #188).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_forward.c (modified) (1 diff)
• src/sh_socket.c (modified) (14 diffs)

trunk/docs/Changelog

@@ +1 @@
+2.6.2:
+        * fix bug in the server function to probe for necessity
+          of configuration reload for client
+
 2.6.1b (23-12-2009):
         * fix missing include for sh_inotify.h in sh_inotify.c

trunk/src/sh_forward.c

@@ -3630 +3630 @@
                     {
                       TPT((0, FIL__, __LINE__, _("msg=<update status>\n")));
-                      if (0 != sl_strcmp(conn->buf, 
-                                         _("Runtime configuration reloaded")))
+                      if (NULL != sl_strstr(conn->buf, 
+                                            _("Runtime configuration reloaded")))
                         {
                           sh_socket_add2reload (conn->client_entry->hostname);

trunk/src/sh_socket.c

@@ -23 +23 @@
  * #define SH_DEBUG_SOCKET
  */
+
 #if defined(SH_WITH_SERVER) && defined(__linux__)
 #define _GNU_SOURCE
@@ -180 +181 @@
       if (0 == sl_strcmp(new->clt, clt))
         {
+#ifdef SH_DEBUG_SOCKET
+          fprintf(stderr, "add2reload: time reset for %s\n", clt);
+#endif
           sl_strlcpy (new->clt, clt, SH_MAXMSGLEN);
           new->cti = time(NULL);
@@ -188 +192 @@
 
   new = SH_ALLOC(sizeof(struct reload_cmd));
+#ifdef SH_DEBUG_SOCKET
+  fprintf(stderr, "add2reload: time set for %s\n", clt);
+#endif
   sl_strlcpy (new->clt, clt, SH_MAXMSGLEN);
   new->cti = time(NULL);
@@ -202 +209 @@
 static void sh_socket_add2list (struct socket_cmd * in);
 
-static void sh_socket_probe4reload (void)
+void sh_socket_probe4reload (void)
 {
   struct reload_cmd  * new;
@@ -215 +222 @@
   struct stat buf;
 
+#ifdef SH_DEBUG_SOCKET
+  fprintf(stderr, "PROBE\n");
+#endif
+
   for (item = (client_t *) zAVLFirst(&avlcursor, all_clients); item;
        item = (client_t *) zAVLNext(&avlcursor))
     {
+#ifdef SH_DEBUG_SOCKET
+      fprintf(stderr, "%s %d\n", item->hostname, (int)item->status_now);
+#endif
+
       if (item->status_now != CLT_INACTIVE)
         {
           file = get_client_conf_file (item->hostname, &dummy);
 
+#ifdef SH_DEBUG_SOCKET
+          fprintf(stderr, "%s\n", file);
+#endif
           if (0 == stat (file, &buf))
             {
@@ -227 +245 @@
               while (new)
                 {
+#ifdef SH_DEBUG_SOCKET
+                  fprintf(stderr, "%s <> %s\n", new->clt, item->hostname);
+#endif
                   if (0 == sl_strcmp(new->clt, item->hostname))
                     {
+#ifdef SH_DEBUG_SOCKET
+                      fprintf(stderr, "%lu <> %lu\n", 
+                              (unsigned long) buf.st_mtime, 
+                              (unsigned long)new->cti);
+#endif
                       if (buf.st_mtime > new->cti)
                         {
@@ -819 +845 @@
       if (sl_strlen(cmd) >= SH_MAXMSGLEN)
         {
+#ifdef SH_DEBUG_SOCKET
+          fprintf (stderr, "Server: command too long: %s\n", cmd);
+#endif
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN,
                           _("Bad message format: command too long"), 
@@ -827 +856 @@
       else if (sl_strlen(clt) >= SH_MAXMSGLEN)
         {
+#ifdef SH_DEBUG_SOCKET
+          fprintf (stderr, "Server: hostname too long: %s\n", clt);
+#endif
           sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN,
                           _("Bad message format: hostname too long"), 
@@ -836 +868 @@
           cmd[2] == 'S' && cmd[3] == 'T')
         {
+#ifdef SH_DEBUG_SOCKET
+          fprintf (stderr, "Server: list %s\n", clt);
+#endif
           goto list_all;
         }
@@ -841 +876 @@
           cmd[2] == 'O' && cmd[3] == 'B' && cmd[4] == 'E')
         {
+#ifdef SH_DEBUG_SOCKET
+          fprintf (stderr, "Server: probe start %s\n", clt);
+#endif
           sh_socket_probe4reload();
+#ifdef SH_DEBUG_SOCKET
+          fprintf (stderr, "Server: probe done  %s\n", clt);
+#endif
           cmd[0] = 'L'; cmd[1] = 'I'; cmd[2] = 'S'; cmd[3] = 'T';cmd[4] = '\0';
           goto list_all;
@@ -851 +892 @@
   else
     {
+#ifdef SH_DEBUG_SOCKET
+      fprintf (stderr, "Server: bad message\n");
+#endif
       sh_error_handle((-1), FIL__, __LINE__, errno, MSG_E_SUBGEN,
                       _("Bad message format"), 
@@ -965 +1009 @@
   sl_strlcpy (new->cmd, in->cmd, sizeof(new->cmd));
   sl_strlcpy (new->clt, in->clt, sizeof(new->clt));
+#ifdef SH_DEBUG_SOCKET
+  fprintf(stderr, "add2list: time set for %s\n", new->clt);
+#endif
   (void) sh_unix_time(0, new->cti, sizeof(new->cti));
   new->next = cmdlist;
@@ -983 +1030 @@
           sl_strlcpy (new->cmd, in->cmd, sizeof(new->cmd));
           sl_strlcpy (new->clt, in->clt, sizeof(new->clt));
+#ifdef SH_DEBUG_SOCKET
+          fprintf(stderr, "add2run: time reset for %s\n", new->clt);
+#endif
           (void) sh_unix_time(0, new->cti, sizeof(new->cti));
           return;
@@ -992 +1042 @@
   sl_strlcpy (new->cmd, in->cmd, sizeof(new->cmd));
   sl_strlcpy (new->clt, in->clt, sizeof(new->clt));
+#ifdef SH_DEBUG_SOCKET
+  fprintf(stderr, "add2run: time set for %s\n", new->clt);
+#endif
   (void) sh_unix_time(0, new->cti, sizeof(new->cti));
   new->next = runlist;