rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore-con - dont complain about socket setup issues when api handles it 

ecore-con api returns failure cases and ecore-con shouldt go spamming
stderr with this as it's inteded to be handled at the api level, so
slience!
This commit is contained in:
Carsten Haitzler 2016-06-13 17:31:51 +09:00
parent 93b4df1f5a
commit 865b10d739
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/ecore_con/ecore_con.c
View File

@ -1966,7 +1966,7 @@ svr_try_connect_plain(Ecore_Con_Server *obj)
{ {
/* we lost our server! */ /* we lost our server! */
ecore_con_event_server_error(obj, strerror(so_err)); ecore_con_event_server_error(obj, strerror(so_err));
ERR("Connection lost: %s", strerror(so_err)); DBG("Connection lost: %s", strerror(so_err));
_ecore_con_server_kill(obj); _ecore_con_server_kill(obj);
return ECORE_CON_DISCONNECTED; return ECORE_CON_DISCONNECTED;
} }
@ -2223,7 +2223,7 @@ _ecore_con_cl_handler(void *data,
#endif #endif
if (ecore_con_ssl_server_init(obj)) if (ecore_con_ssl_server_init(obj))
{ {
ERR("ssl handshaking failed!"); DBG("ssl handshaking failed!");
svr->handshaking = EINA_FALSE; svr->handshaking = EINA_FALSE;
} }
else if (!svr->ssl_state) else if (!svr->ssl_state)
@ -2418,7 +2418,7 @@ _ecore_con_svr_cl_handler(void *data,
{ {
if (ecore_con_ssl_client_init(obj)) if (ecore_con_ssl_client_init(obj))
{ {
ERR("ssl handshaking failed!"); DBG("ssl handshaking failed!");
_ecore_con_client_kill(obj); _ecore_con_client_kill(obj);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
} }

6
src/lib/ecore_con/ecore_con_local.c
View File

@ -379,18 +379,18 @@ start:
if (bind(svr->fd, (struct sockaddr *)&socket_unix, socket_unix_len) < 0) if (bind(svr->fd, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
{ {
ERR("Local socket '%s' bind failed: %s", buf, strerror(errno)); DBG("Local socket '%s' bind failed: %s", buf, strerror(errno));
if ((((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_USER) || if ((((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_USER) ||
((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_SYSTEM)) && ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_SYSTEM)) &&
(connect(svr->fd, (struct sockaddr *)&socket_unix, (connect(svr->fd, (struct sockaddr *)&socket_unix,
socket_unix_len) < 0)) socket_unix_len) < 0))
{ {
ERR("Local socket '%s' connect test failed: %s", buf, strerror(errno)); DBG("Local socket '%s' connect test failed: %s", buf, strerror(errno));
if (unlink(buf) >= 0) if (unlink(buf) >= 0)
goto start; goto start;
else else
{ {
ERR("Local socket '%s' removal failed: %s", buf, strerror(errno)); DBG("Local socket '%s' removal failed: %s", buf, strerror(errno));
goto error_fd; goto error_fd;
} }
} }

2
src/lib/ecore_con/ecore_con_local_win32.c
View File

@ -432,7 +432,7 @@ ecore_con_local_listen(Ecore_Con_Server *obj)
NULL); NULL);
if (svr->pipe == INVALID_HANDLE_VALUE) if (svr->pipe == INVALID_HANDLE_VALUE)
{ {
ERR("Creation of the named pipe '%s' failed", svr->path); DBG("Creation of the named pipe '%s' failed", svr->path);
goto free_path; goto free_path;
} }