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

indents

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-03-25 16:55:34 +01:00
parent 207bfec93e
commit 023bdc055e
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/utils/cmdtalk.cpp
View File

@ -55,17 +55,17 @@ public:
class CmdTalk::Internal { class CmdTalk::Internal {
public: public:
Internal(int timeosecs) Internal(int timeosecs)
: m_cancel(timeosecs) {} : m_cancel(timeosecs) {}
~Internal() { ~Internal() {
delete cmd; delete cmd;
} }
bool readDataElement(string& name, string &data); bool readDataElement(string& name, string &data);
bool talk(const pair<string, string>& arg0, bool talk(const pair<string, string>& arg0,
const unordered_map<string, string>& args, const unordered_map<string, string>& args,
unordered_map<string, string>& rep); unordered_map<string, string>& rep);
ExecCmd *cmd{0}; ExecCmd *cmd{0};
Canceler m_cancel; Canceler m_cancel;
@ -82,31 +82,31 @@ CmdTalk::~CmdTalk()
} }
bool CmdTalk::startCmd(const string& cmdname, bool CmdTalk::startCmd(const string& cmdname,
const vector<string>& args, const vector<string>& args,
const vector<string>& env, const vector<string>& env,
const vector<string>& path) const vector<string>& path)
{ {
LOGDEB("CmdTalk::startCmd\n" ); LOGDEB("CmdTalk::startCmd\n");
delete m->cmd; delete m->cmd;
m->cmd = new ExecCmd; m->cmd = new ExecCmd;
m->cmd->setAdvise(&m->m_cancel); m->cmd->setAdvise(&m->m_cancel);
for (const auto& it : env) { for (const auto& it : env) {
m->cmd->putenv(it); m->cmd->putenv(it);
} }
string acmdname(cmdname); string acmdname(cmdname);
if (!path.empty()) { if (!path.empty()) {
string colonpath; string colonpath;
for (const auto& it: path) { for (const auto& it: path) {
colonpath += it + ":"; colonpath += it + ":";
} }
if (!colonpath.empty()) { if (!colonpath.empty()) {
colonpath.erase(colonpath.size()-1); colonpath.erase(colonpath.size()-1);
} }
LOGDEB("CmdTalk::startCmd: PATH: [" << colonpath << "]\n"); LOGDEB("CmdTalk::startCmd: PATH: [" << colonpath << "]\n");
ExecCmd::which(cmdname, acmdname, colonpath.c_str()); ExecCmd::which(cmdname, acmdname, colonpath.c_str());
} }
if (m->cmd->startExec(acmdname, args, 1, 1) < 0) { if (m->cmd->startExec(acmdname, args, 1, 1) < 0) {
@ -128,7 +128,7 @@ bool CmdTalk::Internal::readDataElement(string& name, string &data)
try { try {
// Read name and length // Read name and length
if (cmd->getline(ibuf) <= 0) { if (cmd->getline(ibuf) <= 0) {
LOGERR("CmdTalk: getline error\n" ); LOGERR("CmdTalk: getline error\n");
return false; return false;
} }
} catch (TimeoutExcept) { } catch (TimeoutExcept) {
@ -137,11 +137,11 @@ bool CmdTalk::Internal::readDataElement(string& name, string &data)
return false; return false;
} }
LOGDEB1("CmdTalk:rde: line [" << (ibuf) << "]\n" ); LOGDEB1("CmdTalk:rde: line [" << ibuf << "]\n");
// Empty line (end of message) ? // Empty line (end of message) ?
if (!ibuf.compare("\n")) { if (!ibuf.compare("\n")) {
LOGDEB("CmdTalk: Got empty line\n" ); LOGDEB1("CmdTalk: Got empty line\n");
return true; return true;
} }
@ -149,7 +149,7 @@ bool CmdTalk::Internal::readDataElement(string& name, string &data)
vector<string> tokens; vector<string> tokens;
stringToTokens(ibuf, tokens); stringToTokens(ibuf, tokens);
if (tokens.size() != 2) { if (tokens.size() != 2) {
LOGERR("CmdTalk: bad line in filter output: [" << (ibuf) << "]\n" ); LOGERR("CmdTalk: bad line in filter output: [" << ibuf << "]\n");
return false; return false;
} }
vector<string>::iterator it = tokens.begin(); vector<string>::iterator it = tokens.begin();
@ -157,7 +157,7 @@ bool CmdTalk::Internal::readDataElement(string& name, string &data)
string& slen = *it; string& slen = *it;
int len; int len;
if (sscanf(slen.c_str(), "%d", &len) != 1) { if (sscanf(slen.c_str(), "%d", &len) != 1) {
LOGERR("CmdTalk: bad line in filter output: [" << (ibuf) << "]\n" ); LOGERR("CmdTalk: bad line in filter output: [" << ibuf << "]\n");
return false; return false;
} }
@ -165,21 +165,21 @@ bool CmdTalk::Internal::readDataElement(string& name, string &data)
data.erase(); data.erase();
if (len > 0 && cmd->receive(data, len) != len) { if (len > 0 && cmd->receive(data, len) != len) {
LOGERR("CmdTalk: expected " << len << " bytes of data, got " << LOGERR("CmdTalk: expected " << len << " bytes of data, got " <<
data.length() << "\n"); data.length() << "\n");
return false; return false;
} }
LOGDEB1("CmdTalk:rde: got: name [" << name << "] len " << len <<"value ["<< LOGDEB1("CmdTalk:rde: got: name [" << name << "] len " << len <<"value ["<<
(data.size() > 100 ? (data.substr(0, 100) + " ...") : data)<< endl); (data.size() > 100 ? (data.substr(0, 100) + " ...") : data)<< endl);
return true; return true;
} }
bool CmdTalk::Internal::talk(const pair<string, string>& arg0, bool CmdTalk::Internal::talk(const pair<string, string>& arg0,
const unordered_map<string, string>& args, const unordered_map<string, string>& args,
unordered_map<string, string>& rep) unordered_map<string, string>& rep)
{ {
std::unique_lock<std::mutex> lock(mmutex); std::unique_lock<std::mutex> lock(mmutex);
if (cmd->getChildPid() <= 0) { if (cmd->getChildPid() <= 0) {
LOGERR("CmdTalk::talk: no process\n"); LOGERR("CmdTalk::talk: no process\n");
return false; return false;
} }
@ -194,30 +194,30 @@ bool CmdTalk::Internal::talk(const pair<string, string>& arg0,
if (cmd->send(obuf.str()) < 0) { if (cmd->send(obuf.str()) < 0) {
cmd->zapChild(); cmd->zapChild();
LOGERR("CmdTalk: send error\n" ); LOGERR("CmdTalk: send error\n");
return false; return false;
} }
// Read answer (multiple elements) // Read answer (multiple elements)
LOGDEB1("CmdTalk: reading answer\n" ); LOGDEB1("CmdTalk: reading answer\n");
for (;;) { for (;;) {
string name, data; string name, data;
if (!readDataElement(name, data)) { if (!readDataElement(name, data)) {
cmd->zapChild(); cmd->zapChild();
return false; return false;
} }
if (name.empty()) { if (name.empty()) {
break; break;
} }
trimstring(name, ":"); trimstring(name, ":");
LOGDEB1("CmdTalk: got [" << name << "] -> [" << data << "]\n"); LOGDEB1("CmdTalk: got [" << name << "] -> [" << data << "]\n");
rep[name] = data; rep[name] = data;
} }
if (rep.find("cmdtalkstatus") != rep.end()) { if (rep.find("cmdtalkstatus") != rep.end()) {
return false; return false;
} else { } else {
return true; return true;
} }
} }
@ -227,15 +227,15 @@ bool CmdTalk::running()
} }
bool CmdTalk::talk(const unordered_map<string, string>& args, bool CmdTalk::talk(const unordered_map<string, string>& args,
unordered_map<string, string>& rep) unordered_map<string, string>& rep)
{ {
return m->talk({"",""}, args, rep); return m->talk({"",""}, args, rep);
} }
bool CmdTalk::callproc( bool CmdTalk::callproc(
const string& proc, const string& proc,
const unordered_map<std::string, std::string>& args, const unordered_map<std::string, std::string>& args,
unordered_map<std::string, std::string>& rep) unordered_map<std::string, std::string>& rep)
{ {
return m->talk({"cmdtalk:proc", proc}, args, rep); return m->talk({"cmdtalk:proc", proc}, args, rep);
} }