Browse Source

Remove crazy call, just use debug.

Brian Aker 13 years ago
parent
commit
22fef0bd59

+ 1 - 1
libgearman-server/client.cc

@@ -80,7 +80,7 @@ void gearman_server_client_free(gearman_server_client_st *client)
   }
   else
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(client);
   }
 }

+ 1 - 1
libgearman-server/connection.c

@@ -212,7 +212,7 @@ void gearman_server_con_free(gearman_server_con_st *con)
   }
   else
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(con);
   }
 }

+ 2 - 2
libgearman-server/function.cc

@@ -95,12 +95,12 @@ void gearman_server_function_free(gearman_server_st *server, gearman_server_func
 {
   if (function->function_name != NULL)
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(function->function_name);
   }
 
   gearmand_server_list_free(server, function);
 
-  gearmand_crazy("free");
+  gearmand_debug("free");
   free(function);
 }

+ 6 - 6
libgearman-server/gearmand.cc

@@ -114,7 +114,7 @@ gearmand_st *gearmand_create(const char *host_arg,
 
   if (! gearman_server_create(&(gearmand->server), job_retries, worker_wakeup, round_robin))
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(gearmand);
     return NULL;
   }
@@ -193,7 +193,7 @@ void gearmand_free(gearmand_st *gearmand)
 
     dcon= gearmand->free_dcon_list;
     gearmand->free_dcon_list= dcon->next;
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(dcon);
   }
 
@@ -208,26 +208,26 @@ void gearmand_free(gearmand_st *gearmand)
   {
     if (gearmand->port_list[x].listen_fd != NULL)
     {
-      gearmand_crazy("free");
+      gearmand_debug("free");
       free(gearmand->port_list[x].listen_fd);
     }
 
     if (gearmand->port_list[x].listen_event != NULL)
     {
-      gearmand_crazy("free");
+      gearmand_debug("free");
       free(gearmand->port_list[x].listen_event);
     }
   }
 
   if (gearmand->port_list != NULL)
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(gearmand->port_list);
   }
 
   gearmand_info("Shutdown complete");
 
-  gearmand_crazy("free");
+  gearmand_debug("free");
   free(gearmand);
 }
 

+ 3 - 3
libgearman-server/gearmand_con.c

@@ -195,7 +195,7 @@ void gearmand_con_free(gearmand_con_st *dcon)
   }
   else
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(dcon);
   }
 }
@@ -277,7 +277,7 @@ gearmand_error_t gearmand_connection_watch(gearmand_io_st *con, short events,
     dcon->last_events= set_events;
   }
 
-  gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM,
+  gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
                      "%15s:%5s Watching  %6s %s",
                      dcon->host, dcon->port,
                      events & POLLIN ? "POLLIN" : "",
@@ -309,7 +309,7 @@ static void _con_ready(int fd __attribute__ ((unused)), short events,
     return;
   }
 
-  gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, 
+  gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, 
                      "%15:%5 Ready     %6s %s",
                      dcon->host, dcon->port,
                      revents & POLLIN ? "POLLIN" : "",

+ 1 - 1
libgearman-server/io.cc

@@ -601,7 +601,7 @@ gearmand_error_t gearman_io_recv(gearman_server_con_st *con, bool recv_data)
         }
         return ret;
       }
-      gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, "read %lu bytes", (unsigned long)recv_size);
+      gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "read %lu bytes", (unsigned long)recv_size);
 
       connection->recv_buffer_size+= recv_size;
     }

+ 0 - 18
libgearman-server/log.cc

@@ -240,24 +240,6 @@ void gearmand_log_debug(const char *position, const char *function, const char *
   }
 }
 
-void gearmand_log_crazy(const char *position, const char *function, const char *format, ...)
-{
-#ifdef DEBUG
-  va_list args;
-
-  if (not Gearmand() || Gearmand()->verbose >= GEARMAND_VERBOSE_CRAZY)
-  {
-    va_start(args, format);
-    gearmand_log(position, function, GEARMAND_VERBOSE_CRAZY, GEARMAN_SUCCESS, format, args);
-    va_end(args);
-  }
-#else
-  (void)position;
-  (void)function;
-  (void)format;
-#endif
-}
-
 gearmand_error_t gearmand_log_perror(const char *position, const char *function, const char *message)
 {
   if (not Gearmand() or (Gearmand()->verbose >= GEARMAND_VERBOSE_ERROR))

+ 0 - 8
libgearman-server/log.h

@@ -97,14 +97,6 @@ GEARMAN_INTERNAL_API
 void gearmand_log_debug(const char *position, const char *function, const char *format, ...);
 #define gearmand_debug(_mesg) gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, (_mesg))
 
-
-/**
- * Log a crazy message, see gearmand_log() for argument details.
- */
-GEARMAN_INTERNAL_API
-void gearmand_log_crazy(const char *position, const char *function, const char *format, ...);
-#define gearmand_crazy(_mesg) gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, (_mesg))
-
 #ifdef __cplusplus
 }
 #endif

+ 5 - 5
libgearman-server/packet.cc

@@ -82,7 +82,7 @@ void gearman_server_packet_free(gearman_server_packet_st *packet,
     }
     else
     {
-      gearmand_crazy("free");
+      gearmand_debug("free");
       free(packet);
     }
   }
@@ -96,7 +96,7 @@ void gearman_server_packet_free(gearman_server_packet_st *packet,
     }
     else
     {
-      gearmand_crazy("free");
+      gearmand_debug("free");
       free(packet);
     }
   }
@@ -307,14 +307,14 @@ void gearmand_packet_free(gearmand_packet_st *packet)
 {
   if (packet->args != packet->args_buffer && packet->args != NULL)
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free(packet->args);
     packet->args= NULL;
   }
 
   if (packet->options.free_data && packet->data != NULL)
   {
-    gearmand_crazy("free");
+    gearmand_debug("free");
     free((void *)packet->data); //@todo fix the need for the casting.
     packet->data= NULL;
   }
@@ -523,7 +523,7 @@ size_t gearmand_packet_unpack(gearmand_packet_st *packet,
       ptr= (uint8_t *)memchr(((uint8_t *)data) + used_size, 0, data_size - used_size);
       if (not ptr)
       {
-        gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, "Possible protocol error for %s, recieved only %u args", gearman_command_info(packet->command)->name, packet->argc);
+        gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "Possible protocol error for %s, recieved only %u args", gearman_command_info(packet->command)->name, packet->argc);
         *ret_ptr= GEARMAN_IO_WAIT;
         return used_size;
       }

+ 2 - 2
libgearman-server/plugins/queue/drizzle/queue.cc

@@ -220,7 +220,7 @@ static drizzle_return_t _libdrizzle_query(plugins::queue::Drizzle *queue,
 {
   drizzle_return_t ret;
 
-  gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, "libdrizzle query: %.*s", (uint32_t)query_size, query);
+  gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "libdrizzle query: %.*s", (uint32_t)query_size, query);
 
   drizzle_result_st *result= drizzle_query(queue->con, queue->result(), query, query_size, &ret);
   if (libdrizzle_failed(ret))
@@ -572,7 +572,7 @@ static gearmand_error_t _libdrizzle_done(gearman_server_st *,
     return gearmand_gerror("snprintf(DELETE)", GEARMAN_MEMORY_ALLOCATION_FAILURE);
   }
 
-  gearmand_log_crazy(GEARMAN_DEFAULT_LOG_PARAM, "%.*", query_size, &query[0]);
+  gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "%.*", query_size, &query[0]);
   
   if (libdrizzle_failed(_libdrizzle_query(queue, &query[0], query_size)))
   {

Some files were not shown because too many files changed in this diff