print more descriptive error messages when scanner connection fails, also don't exit() here

ref T1612
This commit is contained in:
Mike Blumenkrantz 2014-12-05 13:51:08 -05:00
parent 50f5b74cd8
commit ae5ac60dca
1 changed files with 8 additions and 2 deletions

View File

@ -617,8 +617,14 @@ _scanner_del(void *data, int type __UNUSED__, Ecore_Exe_Event_Del *ev)
if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON;
if (!svr)
{
INF("scanner connection dead, exiting");
exit(1);
const char *str = "blame cedric";
if (ev->exit_code == 1)
str = "unable to allocate memory";
else if (ev->exit_code == 2)
str = "unable to create local socket; check \"/$TMPDIR/.ecore_service/\" for stale files";
INF("scanner connection dead (%s), exiting", str);
_e_fm_main_catch(EFM_MODE_USING_RASTER_MOUNT);
}
INF("lost connection to scanner");
scanner = NULL;