mirror of https://github.com/Icinga/icinga2.git
parent
9bc7f0ad75
commit
c1b4a8b757
|
@ -242,7 +242,6 @@ void ConfigObject::RestoreAttribute(const String& attr, bool updateVersion)
|
||||||
String fieldName = tokens[0];
|
String fieldName = tokens[0];
|
||||||
|
|
||||||
int fid = type->GetFieldId(fieldName);
|
int fid = type->GetFieldId(fieldName);
|
||||||
Field field = type->GetFieldInfo(fid);
|
|
||||||
|
|
||||||
Value currentValue = GetField(fid);
|
Value currentValue = GetField(fid);
|
||||||
|
|
||||||
|
|
|
@ -285,7 +285,6 @@ void ApiClient::ExecuteScriptHttpCompletionCallback(HttpRequest& request,
|
||||||
|
|
||||||
Array::Ptr results = result->Get("results");
|
Array::Ptr results = result->Get("results");
|
||||||
Value result;
|
Value result;
|
||||||
bool incompleteExpression = false;
|
|
||||||
String errorMessage = "Unexpected result from API.";
|
String errorMessage = "Unexpected result from API.";
|
||||||
|
|
||||||
if (results && results->GetLength() > 0) {
|
if (results && results->GetLength() > 0) {
|
||||||
|
|
|
@ -35,7 +35,6 @@ using namespace icinga;
|
||||||
|
|
||||||
REGISTER_URLHANDLER("/v1/console", ConsoleHandler);
|
REGISTER_URLHANDLER("/v1/console", ConsoleHandler);
|
||||||
|
|
||||||
static int l_ExternalCommands = 0;
|
|
||||||
static boost::mutex l_QueryMutex;
|
static boost::mutex l_QueryMutex;
|
||||||
static std::map<String, ApiScriptFrame> l_ApiScriptFrames;
|
static std::map<String, ApiScriptFrame> l_ApiScriptFrames;
|
||||||
static Timer::Ptr l_FrameCleanupTimer;
|
static Timer::Ptr l_FrameCleanupTimer;
|
||||||
|
@ -241,7 +240,7 @@ std::vector<String> ConsoleHandler::GetAutocompletionSuggestions(const String& w
|
||||||
|
|
||||||
String::SizeType cperiod = word.RFind(".");
|
String::SizeType cperiod = word.RFind(".");
|
||||||
|
|
||||||
if (cperiod != -1) {
|
if (cperiod != String::NPos) {
|
||||||
String pword = word.SubStr(0, cperiod);
|
String pword = word.SubStr(0, cperiod);
|
||||||
|
|
||||||
Value value;
|
Value value;
|
||||||
|
|
Loading…
Reference in New Issue