return;
}
- memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
+ memcached_error_t *error= libmemcached_xmalloc(&memc, memcached_error_t);
if (error == NULL) // Bad business if this happens
{
return;
server.error_messages= error;
}
+#if 0
+static int error_log_fd= -1;
+#endif
+
static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t &rc, const char *at, int local_errno= 0)
{
if (memc.error_messages && memc.error_messages->query_id != memc.query_id)
rc= MEMCACHED_CONNECTION_FAILURE;
}
- memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
+ memcached_error_t *error= libmemcached_xmalloc(&memc, memcached_error_t);
if (error == NULL) // Bad business if this happens
{
return;
if (str and str->size and local_errno)
{
- error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s), %.*s -> %s",
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s(%s), %.*s -> %s",
+ long(error->root),
memcached_strerror(&memc, rc),
errmsg_ptr,
memcached_string_printf(*str), at);
}
else if (local_errno)
{
- error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s) -> %s",
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s(%s) -> %s",
+ long(error->root),
memcached_strerror(&memc, rc),
errmsg_ptr,
at);
}
else if (rc == MEMCACHED_PARSE_ERROR and str and str->size)
{
- error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%.*s -> %s",
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %.*s -> %s",
+ long(error->root),
int(str->size), str->c_str, at);
}
else if (str and str->size)
{
- error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s, %.*s -> %s",
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s, %.*s -> %s",
+ long(error->root),
memcached_strerror(&memc, rc),
int(str->size), str->c_str, at);
}
else
{
- error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s -> %s",
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "(%lu) %s -> %s",
+ long(error->root),
memcached_strerror(&memc, rc), at);
}
error->next= memc.error_messages;
memc.error_messages= error;
+
+#if 0
+ if (error_log_fd == -1)
+ {
+// unlink("/tmp/libmemcachd.log");
+ if ((error_log_fd= open("/tmp/libmemcachd.log", O_CREAT | O_WRONLY | O_APPEND, 0644)) < 0)
+ {
+ perror("open");
+ error_log_fd= -1;
+ }
+ }
+ ::write(error_log_fd, error->message, error->size);
+ ::write(error_log_fd, "\n", 1);
+#endif
}
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, memcached_string_t& str)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
- if (memcached_success(rc))
+ if (memcached_fatal(rc) == false)
{
return rc;
}
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
- if (memcached_success(rc))
+ if (memcached_fatal(rc) == false)
{
return rc;
}
memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at)
{
assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
- if (memcached_success(rc))
+ if (memcached_fatal(rc) == false)
{
return rc;
}
memcached_return_t memcached_set_error(memcached_st& self, memcached_return_t rc, const char *at)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
- if (memcached_success(rc))
+ if (memcached_fatal(rc) == false)
{
return rc;
}
memcached_string_t error_host= { hostname_port_message, size };
memcached_return_t rc= MEMCACHED_ERRNO;
- if (not self.root)
+ if (self.root == NULL)
+ {
return rc;
+ }
_set(*self.root, &error_host, rc, at, local_errno);
_set(self, (*self.root));
memcached_string_t error_host= { hostname_port_message, size };
memcached_return_t rc= MEMCACHED_ERRNO;
- if (not self.root)
+ if (self.root == NULL)
+ {
return rc;
+ }
_set(*self.root, &error_host, rc, at, local_errno);
_set(self, (*self.root));
if (error->size == 0)
{
- fprintf(stderr, "%s\n", memcached_strerror(NULL, error->rc) );
+ fprintf(stderr, "\t%s\n", memcached_strerror(NULL, error->rc) );
}
else
{
- fprintf(stderr, "%s %s\n", memcached_strerror(NULL, error->rc), error->message);
+ fprintf(stderr, "\t%s %s\n", memcached_strerror(NULL, error->rc), error->message);
}
_error_print(error->next);
void memcached_error_print(const memcached_st *self)
{
- if (not self)
+ if (self == NULL)
+ {
return;
+ }
_error_print(self->error_messages);
+
+ for (uint32_t x= 0; x < memcached_server_count(self); x++)
+ {
+ memcached_server_instance_st instance= memcached_server_instance_by_position(self, x);
+
+ _error_print(instance->error_messages);
+ }
}
static void _error_free(memcached_error_t *error)
}
if (not memc->error_messages)
+ {
return MEMCACHED_SUCCESS;
+ }
return memc->error_messages->rc;
}
}
if (not server->error_messages)
+ {
return memcached_strerror(server->root, MEMCACHED_SUCCESS);
+ }
if (not server->error_messages->size)
+ {
return memcached_strerror(server->root, server->error_messages->rc);
+ }
return server->error_messages->message;
}
return NULL;
}
- memcached_error_t *error= (memcached_error_t *)libmemcached_malloc(server.root, sizeof(memcached_error_t));
+ memcached_error_t *error= libmemcached_xmalloc(server.root, memcached_error_t);
memcpy(error, server.error_messages, sizeof(memcached_error_t));
error->next= NULL;