char message[MAX_ERROR_LENGTH];
};
+static void _set(memcached_server_st& server, memcached_st& memc)
+{
+ if (server.error_messages && server.error_messages->query_id != server.root->query_id)
+ {
+ memcached_error_free(server);
+ }
+
+ if (memc.error_messages == NULL)
+ return;
+
+ memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
+ if (not error) // Bad business if this happens
+ return;
+
+ memcpy(error, memc.error_messages, sizeof(memcached_error_t));
+ error->next= server.error_messages;
+ server.error_messages= error;
+}
+
static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t &rc, const char *at, int local_errno= 0)
{
(void)at;
if (memc.error_messages && memc.error_messages->query_id != memc.query_id)
{
- memcached_error_free(&memc);
+ memcached_error_free(memc);
}
// For memory allocation we use our error since it is a bit more specific
if (local_errno == ENOMEM and rc == MEMCACHED_ERRNO)
{
- local_errno= ENOMEM;
rc= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
}
rc= MEMCACHED_ERRNO;
}
+ if (rc == MEMCACHED_ERRNO and local_errno == ENOTCONN)
+ {
+ rc= MEMCACHED_CONNECTION_FAILURE;
+ }
+
+ if (local_errno == EINVAL)
+ {
+ rc= MEMCACHED_INVALID_ARGUMENTS;
+ }
+
+ if (local_errno == ECONNREFUSED)
+ {
+ rc= MEMCACHED_CONNECTION_FAILURE;
+ }
+
memcached_error_t *error= (struct memcached_error_t *)libmemcached_malloc(&memc, sizeof(struct memcached_error_t));
if (not error) // Bad business if this happens
return;
error->rc= rc;
error->local_errno= local_errno;
- if (str)
+ const char *errmsg_ptr;
+ char errmsg[MAX_ERROR_LENGTH];
+ errmsg[0]= 0;
+ errmsg_ptr= errmsg;
+
+ if (local_errno)
+ {
+#ifdef STRERROR_R_CHAR_P
+ errmsg_ptr= strerror_r(local_errno, errmsg, sizeof(errmsg));
+#else
+ strerror_r(local_errno, errmsg, sizeof(errmsg));
+ errmsg_ptr= errmsg;
+#endif
+ }
+
+
+ if (str and str->size and local_errno)
+ {
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s(%s), %.*s -> %s",
+ 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",
+ memcached_strerror(&memc, rc),
+ errmsg_ptr,
+ at);
+ }
+ else if (str and str->size)
{
- size_t length= str->size > (size_t)MAX_ERROR_LENGTH ? MAX_ERROR_LENGTH : str->size;
- error->size= length;
- memcpy(error->message, str->c_str, error->size);
- error->message[error->size]= 0;
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s, %.*s -> %s",
+ memcached_strerror(&memc, rc),
+ int(str->size), str->c_str, at);
}
else
{
- error->size= 0;
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s -> %s",
+ memcached_strerror(&memc, rc), at);
}
error->next= memc.error_messages;
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
{
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
memcached_string_t tmp= { str, length };
return memcached_set_error(memc, rc, at, tmp);
}
memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at, const char *str, size_t length)
{
+ 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");
memcached_string_t tmp= { str, length };
return memcached_set_error(self, rc, at, tmp);
}
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))
return MEMCACHED_SUCCESS;
memcached_return_t memcached_set_error(memcached_server_st& self, 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");
+ 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))
return MEMCACHED_SUCCESS;
return rc;
_set(*self.root, &error_host, rc, at);
+ _set(self, (*self.root));
return rc;
}
memcached_return_t memcached_set_error(memcached_server_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");
+ 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))
return MEMCACHED_SUCCESS;
return rc;
_set(*self.root, &error_host, rc, at);
+ _set(self, *self.root);
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))
return MEMCACHED_SUCCESS;
memcached_string_t error_host= { hostname_port_message, size };
- self.cached_errno= local_errno; // Store in the actual server
-
memcached_return_t rc= MEMCACHED_ERRNO;
if (not self.root)
return rc;
_set(*self.root, &error_host, rc, at, local_errno);
+ _set(self, (*self.root));
return rc;
}
memcached_string_t error_host= { hostname_port_message, size };
- self.cached_errno= local_errno; // Store in the actual server
-
memcached_return_t rc= MEMCACHED_ERRNO;
if (not self.root)
return rc;
_set(*self.root, &error_host, rc, at, local_errno);
+ _set(self, (*self.root));
return rc;
}
}
}
-void memcached_error_free(memcached_st *self)
+void memcached_error_free(memcached_st& self)
{
- if (not self)
- return;
+ _error_free(self.error_messages);
+ self.error_messages= NULL;
+}
- _error_free(self->error_messages);
- self->error_messages= NULL;
+void memcached_error_free(memcached_server_st& self)
+{
+ _error_free(self.error_messages);
+ self.error_messages= NULL;
}
const char *memcached_last_error_message(memcached_st *memc)
return memc->error_messages->message;
}
+
+bool memcached_has_current_error(memcached_st &memc)
+{
+ if (memc.error_messages
+ and memc.error_messages->query_id == memc.query_id
+ and memcached_failed(memc.error_messages->rc))
+ {
+ return true;
+ }
+
+ return false;
+}
+
memcached_return_t memcached_last_error(memcached_st *memc)
{
if (not memc)
return memc->error_messages->local_errno;
}
+
+const char *memcached_server_error(memcached_server_instance_st server)
+{
+ if (not server)
+ return memcached_strerror(server->root, MEMCACHED_INVALID_ARGUMENTS);
+
+ 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;
+}
+
+
+memcached_error_t *memcached_error_copy(const memcached_server_st& server)
+{
+ if (not server.error_messages)
+ return NULL;
+
+ memcached_error_t *error= (memcached_error_t *)libmemcached_malloc(server.root, sizeof(memcached_error_t));
+ memcpy(error, server.error_messages, sizeof(memcached_error_t));
+ error->next= NULL;
+
+ return error;
+}
+
+memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr)
+{
+ if (ptr and ptr->error_messages)
+ {
+ return ptr->error_messages->rc;
+ }
+
+ return MEMCACHED_FAILURE;
+}
projects / awesomized / libmemcached / blobdiff