tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move command argument logging into the unix process class. 

Refs #5225
This commit is contained in:
Michael Friedrich 2013-12-16 16:22:22 +01:00
parent eb4afb1eda
commit f4c132ca5b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/process-unix.cpp
View File

@ -27,6 +27,7 @@
#include <boost/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/thread/thread.hpp>
#include <boost/algorithm/string/join.hpp>
#ifndef _WIN32
#include <execvpe.h>
@ -67,6 +68,8 @@ ProcessResult Process::Run(void)
#endif /* HAVE_PIPE2 */
// build argv
Log(LogDebug, "base", "Running command '" + boost::algorithm::join(m_Arguments, " ") + "'.");
char **argv = new char *[m_Arguments.size() + 1];
for (unsigned int i = 0; i < m_Arguments.size(); i++)
@ -153,7 +156,7 @@ ProcessResult Process::Run(void)
int fd = fds[0];
(void) close(fds[1]);
char buffer[512];
char buffer[512];
std::ostringstream outputStream;

6
lib/base/process.cpp
View File

@ -21,17 +21,13 @@
#include "base/process.h"
#include "base/array.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
#include <boost/algorithm/string/join.hpp>
using namespace icinga;
Process::Process(const std::vector<String>& arguments, const Dictionary::Ptr& extraEnvironment)
: m_Arguments(arguments), m_ExtraEnvironment(extraEnvironment), m_Timeout(600)
{
Log(LogDebug, "base", "Running command '" + boost::algorithm::join(arguments, " ") + "'.");
}
{ }
std::vector<String> Process::SplitCommand(const Value& command)
{