hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create ExternalCmd during monitor configuration

Browse Source 
The command object need not be recreated every time it's ran.
This commit is contained in:
Esa Korhonen
2019-05-29 14:43:05 +03:00
parent 4b69156875
commit 4ed154d07f
4 changed files with 54 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/internal/externcmd.hh
View File

@ -14,6 +14,7 @@
#include <maxscale/ccdefs.hh>
#include <unistd.h>
#include <memory>
class ExternalCmd
{
@ -26,7 +27,7 @@ public:
* @param timeout Command timeout in seconds
* @return Pointer to new external command struct or NULL if an error occurred
*/
static ExternalCmd* create(const char* argstr, int timeout);
static std::unique_ptr<ExternalCmd> create(const std::string& argstr, int timeout);
/**
* Execute a command
@ -54,15 +55,16 @@ public:
*/
bool externcmd_matches(const char* match);
void reset_substituted();
const char* substituted() const;
private:
static const int MAX_ARGS {256};
private:
std::string m_command; /**< Original command */
std::string m_command_substituted; /**< Command with substitutions */
int m_timeout; /**< Command timeout in seconds */
int m_timeout; /**< Command timeout in seconds */
ExternalCmd(const std::string& script, int timeout);