tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle interrupt requests and set timeout on execs

Browse Source
This commit is contained in:
dockes 2009-10-13 12:22:40 +00:00
parent 70f757368d
commit 6f3be8eb60
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/internfile/mh_exec.cpp
View File

@ -26,6 +26,7 @@ static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.14 2008-10-09 09:19:37 dockes Exp
#include "smallut.h" #include "smallut.h"
#include "transcode.h" #include "transcode.h"
#include "md5.h" #include "md5.h"
#include "rclconfig.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -34,13 +35,29 @@ static char rcsid[] = "@(#$Id: mh_exec.cpp,v 1.14 2008-10-09 09:19:37 dockes Exp
using namespace std; using namespace std;
#endif /* NO_NAMESPACES */ #endif /* NO_NAMESPACES */
// This is called periodically by ExeCmd when it is waiting for data,
// or when it does receive some. We may choose to interrupt the
// command.
class MEAdv : public ExecCmdAdvise { class MEAdv : public ExecCmdAdvise {
public: public:
void newData(int) { MEAdv(int maxsecs) : m_filtermaxseconds(maxsecs) {m_start = time(0L);}
void newData(int n) {
LOGDEB1(("MHExec: new data, count %d\n", n));
if (time(0L) - m_start > m_filtermaxseconds) {
LOGERR(("MimeHandlerExec: filter timeout (%d S)\n",
m_filtermaxseconds));
CancelCheck::instance().setCancel();
}
// If a cancel request was set by the signal handler (or by us
// just above), this will raise an exception. Another approach
// would be to call ExeCmd::setCancel().
CancelCheck::instance().checkCancel(); CancelCheck::instance().checkCancel();
} }
time_t m_start;
int m_filtermaxseconds;
}; };
// Execute an external program to translate a file from its native // Execute an external program to translate a file from its native
// format to text or html. // format to text or html.
bool MimeHandlerExec::next_document() bool MimeHandlerExec::next_document()
@ -59,6 +76,12 @@ bool MimeHandlerExec::next_document()
return false; return false;
} }
int filtermaxseconds = 900;
RclConfig *conf = RclConfig::getMainConfig();
if (conf) {
conf->getConfParam("filtermaxseconds", &filtermaxseconds);
}
// Command name // Command name
string cmd = params.front(); string cmd = params.front();
@ -73,11 +96,18 @@ bool MimeHandlerExec::next_document()
string& output = m_metaData["content"]; string& output = m_metaData["content"];
output.erase(); output.erase();
ExecCmd mexec; ExecCmd mexec;
MEAdv adv; MEAdv adv(filtermaxseconds);
mexec.setAdvise(&adv); mexec.setAdvise(&adv);
mexec.putenv(m_forPreview ? "RECOLL_FILTER_FORPREVIEW=yes" : mexec.putenv(m_forPreview ? "RECOLL_FILTER_FORPREVIEW=yes" :
"RECOLL_FILTER_FORPREVIEW=no"); "RECOLL_FILTER_FORPREVIEW=no");
int status = mexec.doexec(cmd, myparams, 0, &output);
int status;
try {
status = mexec.doexec(cmd, myparams, 0, &output);
} catch (CancelExcept) {
LOGERR(("MimeHandlerExec: cancelled\n"));
status = 0x110f;
}
if (status) { if (status) {
LOGERR(("MimeHandlerExec: command status 0x%x for %s\n", LOGERR(("MimeHandlerExec: command status 0x%x for %s\n",