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

Implement Convert class, move existing type conversion functionality there 

Fixes #3580
This commit is contained in:
Gunnar Beutner 2013-01-29 12:05:46 +01:00
parent c563736588
commit 76f37c1d71
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/Makefile.am
View File

@ -12,6 +12,8 @@ libbase_la_SOURCES = \
component.h \
connection.cpp \
connection.h \
convert.cpp \
convert.h \
dictionary.cpp \
dictionary.h \
dynamicobject.cpp \

5
lib/base/qstring.cpp
View File

@ -159,11 +159,6 @@ String::ConstIterator String::End(void) const
return m_Data.end();
}
double String::ToDouble(void) const
{
return strtod(CStr(), NULL);
}
ostream& icinga::operator<<(ostream& stream, const String& str)
{
stream << static_cast<std::string>(str);

2
lib/base/qstring.h
View File

@ -87,8 +87,6 @@ public:
Iterator End(void);
ConstIterator End(void) const;
double ToDouble(void) const;
static const size_t NPos;
private:

26
lib/icinga/externalcommand.cpp
View File

@ -40,7 +40,7 @@ void ExternalCommand::Execute(const String& line)
String timestamp = line.SubStr(1, pos - 1);
String args = line.SubStr(pos + 2, String::NPos);
double ts = timestamp.ToDouble();
double ts = Convert::ToDouble(timestamp);
if (ts == 0)
throw_exception(invalid_argument("Invalid timestamp in command: " + line));
@ -121,7 +121,7 @@ void ExternalCommand::ProcessServiceCheckResult(double time, const vector<String
if (!service->GetEnablePassiveChecks())
throw_exception(invalid_argument("Got passive check result for service '" + arguments[1] + "' which has passive checks disabled."));
int exitStatus = arguments[2].ToDouble();
int exitStatus = Convert::ToDouble(arguments[2]);
Dictionary::Ptr result = PluginCheckTask::ParseCheckOutput(arguments[3]);
result->Set("state", PluginCheckTask::ExitStatusToState(exitStatus));
@ -151,7 +151,7 @@ void ExternalCommand::ScheduleSvcCheck(double time, const vector<String>& argume
Service::Ptr service = Service::GetByName(arguments[1]);
double planned_check = arguments[2].ToDouble();
double planned_check = Convert::ToDouble(arguments[2]);
if (planned_check > service->GetNextCheck()) {
Logger::Write(LogInformation, "icinga", "Ignoring reschedule request for service '" +
@ -175,7 +175,7 @@ void ExternalCommand::ScheduleForcedSvcCheck(double time, const vector<String>&
Logger::Write(LogInformation, "icinga", "Rescheduling next check for service '" + arguments[1] + "'");
service->SetForceNextCheck(true);
service->SetNextCheck(arguments[2].ToDouble());
service->SetNextCheck(Convert::ToDouble(arguments[2]));
}
void ExternalCommand::EnableSvcCheck(double time, const vector<String>& arguments)
@ -220,7 +220,7 @@ void ExternalCommand::ScheduleForcedHostSvcChecks(double time, const vector<Stri
if (!Host::Exists(arguments[0]))
throw_exception(invalid_argument("The host '" + arguments[0] + "' does not exist."));
double planned_check = arguments[1].ToDouble();
double planned_check = Convert::ToDouble(arguments[1]);
Host::Ptr host = Host::GetByName(arguments[0]);
@ -245,7 +245,7 @@ void ExternalCommand::ScheduleHostSvcChecks(double time, const vector<String>& a
if (!Host::Exists(arguments[0]))
throw_exception(invalid_argument("The host '" + arguments[0] + "' does not exist."));
double planned_check = arguments[1].ToDouble();
double planned_check = Convert::ToDouble(arguments[1]);
Host::Ptr host = Host::GetByName(arguments[0]);
@ -319,7 +319,7 @@ void ExternalCommand::AcknowledgeSvcProblem(double time, const vector<String>& a
if (!Service::Exists(arguments[1]))
throw_exception(invalid_argument("The service '" + arguments[1] + "' does not exist."));
int sticky = arguments[2].ToDouble();
bool sticky = Convert::ToBool(arguments[2]);
Service::Ptr service = Service::GetByName(arguments[1]);
@ -339,8 +339,8 @@ void ExternalCommand::AcknowledgeSvcProblemExpire(double time, const vector<Stri
if (!Service::Exists(arguments[1]))
throw_exception(invalid_argument("The service '" + arguments[1] + "' does not exist."));
int sticky = arguments[2].ToDouble();
double timestamp = arguments[5].ToDouble();
bool sticky = Convert::ToBool(arguments[2]);
double timestamp = Convert::ToDouble(arguments[5]);
Service::Ptr service = Service::GetByName(arguments[1]);
@ -375,7 +375,7 @@ void ExternalCommand::AcknowledgeHostProblem(double time, const vector<String>&
if (!Host::Exists(arguments[0]))
throw_exception(invalid_argument("The host '" + arguments[0] + "' does not exist."));
int sticky = arguments[0].ToDouble();
bool sticky = Convert::ToBool(arguments[0]);
Host::Ptr host = Host::GetByName(arguments[0]);
@ -395,8 +395,8 @@ void ExternalCommand::AcknowledgeHostProblemExpire(double time, const vector<Str
if (!Host::Exists(arguments[0]))
throw_exception(invalid_argument("The host '" + arguments[0] + "' does not exist."));
int sticky = arguments[1].ToDouble();
double timestamp = arguments[4].ToDouble();
bool sticky = Convert::ToBool(arguments[1]);
double timestamp = Convert::ToDouble(arguments[4]);
Host::Ptr host = Host::GetByName(arguments[0]);
@ -593,7 +593,7 @@ void ExternalCommand::ProcessFile(double time, const vector<String>& arguments)
throw_exception(invalid_argument("Expected 2 arguments."));
String file = arguments[0];
int del = arguments[1].ToDouble();
bool del = Convert::ToBool(arguments[1]);
ifstream ifp;
ifp.exceptions(ifstream::badbit);