Skip to content

Fix the issue where the lightdm service is blocked after failing to c… #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
winnerym100 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the issue where the lightdm service is blocked after failing to c… #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/x-server-local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ got_signal_cb (Process *process, int signum, XServerLocal *server)
l_debug (server, "Got signal from X server :%d", priv->display_number);

// FIXME: Check return value
DISPLAY_SERVER_CLASS (x_server_local_parent_class)->start (DISPLAY_SERVER (server));
gboolean start_result = DISPLAY_SERVER_CLASS (x_server_local_parent_class)->start (DISPLAY_SERVER (server));
if (!start_result) {
priv->got_signal = FALSE;
l_debug (server, "X service start failed for rewait signal");
}
}
}

Expand Down
28 changes: 26 additions & 2 deletions src/x-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,33 @@ x_server_start (DisplayServer *display_server)
/* Open connection */
l_debug (server, "Connecting to XServer %s", x_server_get_address (server));
priv->connection = xcb_connect_to_display_with_auth_info (x_server_get_address (server), auth, NULL);
if (xcb_connection_has_error (priv->connection))
int error_code = xcb_connection_has_error (priv->connection);
if (error_code)
{
l_debug (server, "Error connecting to XServer %s", x_server_get_address (server));
l_debug (server, "Error connecting to XServer %s， error code:%d", x_server_get_address (server), error_code);
switch (error_code) {
case XCB_CONN_ERROR:
l_debug (server, "XCB connection error: Socket, Pipe or I/O error\n");
break;
case XCB_CONN_CLOSED_EXT_NOTSUPPORTED:
l_debug (server, "XCB connection error: Extension not supported\n");
break;
case XCB_CONN_CLOSED_MEM_INSUFFICIENT:
l_debug (server, "XCB connection error: Memory insufficient\n");
break;
case XCB_CONN_CLOSED_REQ_LEN_EXCEED:
l_debug (server, "XCB connection error: Request length exceeded\n");
break;
case XCB_CONN_CLOSED_PARSE_ERR:
l_debug (server, "XCB connection error: Can't parse display string\n");
break;
case XCB_CONN_CLOSED_INVALID_SCREEN:
l_debug (server, "XCB connection error: Invalid screen\n");
break;
default:
l_debug (server, "XCB connection error: Unknown error (%d)\n", error_code);
break;
}
return FALSE;
}

Expand Down