summaryrefslogtreecommitdiff
path: root/src/lib/efreet
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-03 12:49:08 -0400
committerChris Michael <cp.michael@samsung.com>2018-07-03 12:49:08 -0400
commitb4c2db8d05108c2902dc7b3c560f9e52d5d429c4 (patch)
tree485af89c3704d235c5e16675fc83f8df7f7841b3 /src/lib/efreet
parentdca39ebec185590d5b4b1c8efd80ed9f0c6e28d0 (diff)
efreet: use correct path when generating error message about stale efreetd socket
Summary: using runtime directory in all cases for this is wrong, as ecore-con has a number of fallback codepaths for the case where runtime directory is not set or not valid. by using the same ecore-con function which ecore-ipc uses to generate the socket string, the error message path should always be the same as the path which is used by efreetd extra linkage was required by efreet in order to use ecore-con functions, so the internal lib variable in the build system was modified to provide this @fix fix T7045 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T7045 Differential Revision: https://phab.enlightenment.org/D6425
Diffstat (limited to 'src/lib/efreet')
-rw-r--r--src/lib/efreet/efreet_cache.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 5801509cb6..8ede4614d6 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -16,6 +16,7 @@
16#include <Ecore.h> 16#include <Ecore.h>
17#include <Ecore_File.h> 17#include <Ecore_File.h>
18#include <Ecore_Ipc.h> 18#include <Ecore_Ipc.h>
19#include <Ecore_Con.h>
19 20
20/* define macros and variable for using the eina logging system */ 21/* define macros and variable for using the eina logging system */
21#define EFREET_MODULE_LOG_DOM _efreet_cache_log_dom 22#define EFREET_MODULE_LOG_DOM _efreet_cache_log_dom
@@ -168,9 +169,10 @@ _cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
168 if (disable_cache) return ECORE_CALLBACK_RENEW; 169 if (disable_cache) return ECORE_CALLBACK_RENEW;
169 if (reconnect_count > 10) 170 if (reconnect_count > 10)
170 { 171 {
172 char *address = ecore_con_local_path_new(EINA_FALSE, "efreetd", 0);
171 reconnect_timer = NULL; 173 reconnect_timer = NULL;
172 ERR("efreetd connection failed 10 times! check for stale socket files in %s/.ecore/efreetd", 174 ERR("efreetd connection failed 10 times! check for stale socket file at %s", address);
173 efreet_runtime_dir_get()); 175 free(address);
174 return EINA_FALSE; 176 return EINA_FALSE;
175 } 177 }
176 t = ecore_time_get(); 178 t = ecore_time_get();