lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

skynet_error output abnormal log add error tag (#2039)

Browse Source
This commit is contained in:
fanyh
2025-03-18 20:14:45 +08:00
committed by GitHub
parent 93e72a92ac
commit 1ba381a1c2
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skynet-src/skynet_monitor.c
View File

@@ -39,7 +39,7 @@ skynet_monitor_check(struct skynet_monitor *sm) {
if (sm->version == sm->check_version) { if (sm->version == sm->check_version) {
if (sm->destination) { if (sm->destination) {
skynet_context_endless(sm->destination); skynet_context_endless(sm->destination);
skynet_error(NULL, "A message from [ :%08x ] to [ :%08x ] maybe in an endless loop (version = %d)", sm->source , sm->destination, sm->version); skynet_error(NULL, "error: A message from [ :%08x ] to [ :%08x ] maybe in an endless loop (version = %d)", sm->source , sm->destination, sm->version);
} }
} else { } else {
sm->check_version = sm->version; sm->check_version = sm->version;

18
skynet-src/skynet_server.c
View File

@@ -170,7 +170,7 @@ skynet_context_new(const char * name, const char *param) {
} }
return ret; return ret;
} else { } else {
skynet_error(ctx, "FAILED launch %s", name); skynet_error(ctx, "error: launch %s FAILED", name);
uint32_t handle = ctx->handle; uint32_t handle = ctx->handle;
skynet_context_release(ctx); skynet_context_release(ctx);
skynet_handle_retire(handle); skynet_handle_retire(handle);
@@ -324,7 +324,7 @@ skynet_context_message_dispatch(struct skynet_monitor *sm, struct message_queue
} }
int overload = skynet_mq_overload(q); int overload = skynet_mq_overload(q);
if (overload) { if (overload) {
skynet_error(ctx, "May overload, message queue length = %d", overload); skynet_error(ctx, "error: May overload, message queue length = %d", overload);
} }
skynet_monitor_trigger(sm, msg.source , handle); skynet_monitor_trigger(sm, msg.source , handle);
@@ -370,7 +370,7 @@ skynet_queryname(struct skynet_context * context, const char * name) {
case '.': case '.':
return skynet_handle_findname(name + 1); return skynet_handle_findname(name + 1);
} }
skynet_error(context, "Don't support query global name %s",name); skynet_error(context, "error: Don't support query global name %s",name);
return 0; return 0;
} }
@@ -413,7 +413,7 @@ cmd_reg(struct skynet_context * context, const char * param) {
} else if (param[0] == '.') { } else if (param[0] == '.') {
return skynet_handle_namehandle(context->handle, param + 1); return skynet_handle_namehandle(context->handle, param + 1);
} else { } else {
skynet_error(context, "Can't register global name %s in C", param); skynet_error(context, "error: Can't register global name %s in C", param);
return NULL; return NULL;
} }
} }
@@ -446,7 +446,7 @@ cmd_name(struct skynet_context * context, const char * param) {
if (name[0] == '.') { if (name[0] == '.') {
return skynet_handle_namehandle(handle_id, name + 1); return skynet_handle_namehandle(handle_id, name + 1);
} else { } else {
skynet_error(context, "Can't set global name %s in C", name); skynet_error(context, "error: Can't set global name %s in C", name);
} }
return NULL; return NULL;
} }
@@ -465,7 +465,7 @@ tohandle(struct skynet_context * context, const char * param) {
} else if (param[0] == '.') { } else if (param[0] == '.') {
handle = skynet_handle_findname(param+1); handle = skynet_handle_findname(param+1);
} else { } else {
skynet_error(context, "Can't convert %s to handle",param); skynet_error(context, "error: Can't convert %s to handle",param);
} }
return handle; return handle;
@@ -700,7 +700,7 @@ _filter_args(struct skynet_context * context, int type, int *session, void ** da
int int
skynet_send(struct skynet_context * context, uint32_t source, uint32_t destination , int type, int session, void * data, size_t sz) { skynet_send(struct skynet_context * context, uint32_t source, uint32_t destination , int type, int session, void * data, size_t sz) {
if ((sz & MESSAGE_TYPE_MASK) != sz) { if ((sz & MESSAGE_TYPE_MASK) != sz) {
skynet_error(context, "The message to %x is too large", destination); skynet_error(context, "error: The message to %x is too large", destination);
if (type & PTYPE_TAG_DONTCOPY) { if (type & PTYPE_TAG_DONTCOPY) {
skynet_free(data); skynet_free(data);
} }
@@ -714,7 +714,7 @@ skynet_send(struct skynet_context * context, uint32_t source, uint32_t destinati
if (destination == 0) { if (destination == 0) {
if (data) { if (data) {
skynet_error(context, "Destination address can't be 0"); skynet_error(context, "error: Destination address can't be 0");
skynet_free(data); skynet_free(data);
return -1; return -1;
} }
@@ -761,7 +761,7 @@ skynet_sendname(struct skynet_context * context, uint32_t source, const char * a
} }
} else { } else {
if ((sz & MESSAGE_TYPE_MASK) != sz) { if ((sz & MESSAGE_TYPE_MASK) != sz) {
skynet_error(context, "The message to %s is too large", addr); skynet_error(context, "error: The message to %s is too large", addr);
if (type & PTYPE_TAG_DONTCOPY) { if (type & PTYPE_TAG_DONTCOPY) {
skynet_free(data); skynet_free(data);
} }

2
skynet-src/skynet_socket.c
View File

@@ -107,7 +107,7 @@ skynet_socket_poll() {
forward_message(SKYNET_SOCKET_TYPE_WARNING, false, &result); forward_message(SKYNET_SOCKET_TYPE_WARNING, false, &result);
break; break;
default: default:
skynet_error(NULL, "Unknown socket message type %d.",type); skynet_error(NULL, "error: Unknown socket message type %d.",type);
return -1; return -1;
} }
if (more) { if (more) {

22
skynet-src/socket_server.c
View File

@@ -392,17 +392,17 @@ socket_server_create(uint64_t time) {
int fd[2]; int fd[2];
poll_fd efd = sp_create(); poll_fd efd = sp_create();
if (sp_invalid(efd)) { if (sp_invalid(efd)) {
skynet_error(NULL, "socket-server: create event pool failed."); skynet_error(NULL, "socket-server error: create event pool failed.");
return NULL; return NULL;
} }
if (pipe(fd)) { if (pipe(fd)) {
sp_release(efd); sp_release(efd);
skynet_error(NULL, "socket-server: create socket pair failed."); skynet_error(NULL, "socket-server error: create socket pair failed.");
return NULL; return NULL;
} }
if (sp_add(efd, fd[0], NULL)) { if (sp_add(efd, fd[0], NULL)) {
// add recvctrl_fd to event poll // add recvctrl_fd to event poll
skynet_error(NULL, "socket-server: can't add server fd to event pool."); skynet_error(NULL, "socket-server error: can't add server fd to event pool.");
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
sp_release(efd); sp_release(efd);
@@ -796,7 +796,7 @@ send_list_udp(struct socket_server *ss, struct socket *s, struct wb_list *list,
union sockaddr_all sa; union sockaddr_all sa;
socklen_t sasz = udp_socket_address(s, udp->udp_address, &sa); socklen_t sasz = udp_socket_address(s, udp->udp_address, &sa);
if (sasz == 0) { if (sasz == 0) {
skynet_error(NULL, "socket-server : udp (%d) type mismatch.", s->id); skynet_error(NULL, "socket-server : udp (%d) error: type mismatch.", s->id);
drop_udp(ss, s, list, tmp); drop_udp(ss, s, list, tmp);
return -1; return -1;
} }
@@ -1032,7 +1032,7 @@ send_socket(struct socket_server *ss, struct request_send * request, struct sock
return -1; return -1;
} }
if (type == SOCKET_TYPE_PLISTEN || type == SOCKET_TYPE_LISTEN) { if (type == SOCKET_TYPE_PLISTEN || type == SOCKET_TYPE_LISTEN) {
skynet_error(NULL, "socket-server: write to listen fd %d.", id); skynet_error(NULL, "socket-server error: write to listen fd %d.", id);
so.free_func((void *)request->buffer); so.free_func((void *)request->buffer);
return -1; return -1;
} }
@@ -1048,7 +1048,7 @@ send_socket(struct socket_server *ss, struct request_send * request, struct sock
socklen_t sasz = udp_socket_address(s, udp_address, &sa); socklen_t sasz = udp_socket_address(s, udp_address, &sa);
if (sasz == 0) { if (sasz == 0) {
// udp type mismatch, just drop it. // udp type mismatch, just drop it.
skynet_error(NULL, "socket-server: udp socket (%d) type mismatch.", id); skynet_error(NULL, "socket-server: udp socket (%d) error: type mismatch.", id);
so.free_func((void *)request->buffer); so.free_func((void *)request->buffer);
return -1; return -1;
} }
@@ -1450,7 +1450,7 @@ ctrl_cmd(struct socket_server *ss, struct socket_message *result) {
add_udp_socket(ss, (struct request_udp *)buffer); add_udp_socket(ss, (struct request_udp *)buffer);
return -1; return -1;
default: default:
skynet_error(NULL, "socket-server: Unknown ctrl %c.",type); skynet_error(NULL, "socket-server error: Unknown ctrl %c.",type);
return -1; return -1;
}; };
@@ -1729,7 +1729,7 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
ss->event_n = 0; ss->event_n = 0;
int err = errno; int err = errno;
if (err != EINTR) { if (err != EINTR) {
skynet_error(NULL, "socket-server: %s", strerror(err)); skynet_error(NULL, "socket-server error: %s", strerror(err));
} }
continue; continue;
} }
@@ -1756,7 +1756,7 @@ socket_server_poll(struct socket_server *ss, struct socket_message * result, int
break; break;
} }
case SOCKET_TYPE_INVALID: case SOCKET_TYPE_INVALID:
skynet_error(NULL, "socket-server: invalid socket"); skynet_error(NULL, "socket-server error: invalid socket");
break; break;
default: default:
if (e->read) { if (e->read) {
@@ -1840,7 +1840,7 @@ static int
open_request(struct socket_server *ss, struct request_package *req, uintptr_t opaque, const char *addr, int port) { open_request(struct socket_server *ss, struct request_package *req, uintptr_t opaque, const char *addr, int port) {
int len = strlen(addr); int len = strlen(addr);
if (len + sizeof(req->u.open) >= 256) { if (len + sizeof(req->u.open) >= 256) {
skynet_error(NULL, "socket-server : Invalid addr %s.",addr); skynet_error(NULL, "socket-server error: Invalid addr %s.",addr);
return -1; return -1;
} }
int id = reserve_id(ss); int id = reserve_id(ss);
@@ -1896,7 +1896,7 @@ socket_server_send(struct socket_server *ss, struct socket_sendbuffer *buf) {
union sockaddr_all sa; union sockaddr_all sa;
socklen_t sasz = udp_socket_address(s, s->p.udp_address, &sa); socklen_t sasz = udp_socket_address(s, s->p.udp_address, &sa);
if (sasz == 0) { if (sasz == 0) {
skynet_error(NULL, "socket-server : set udp (%d) address first.", id); skynet_error(NULL, "socket-server : set udp (%d) error: address first.", id);
socket_unlock(&l); socket_unlock(&l);
so.free_func((void *)buf->buffer); so.free_func((void *)buf->buffer);
return -1; return -1;