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

Removed dependency on boost/uuid.

This commit is contained in:
Gunnar Beutner 2013-05-03 11:26:18 +02:00
parent cf18ac6deb
commit 10dff1d8c1
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/base/utility.cpp
View File

@ -18,13 +18,11 @@
******************************************************************************/
#include "base/utility.h"
#include "base/convert.h"
#include "base/application.h"
#include "base/logger_fwd.h"
#include "base/exception.h"
#include <mmatch.h>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/function.hpp>
#include <boost/foreach.hpp>
@ -276,14 +274,33 @@ Utility::LoadExtensionLibrary(const String& library)
}
/**
* Generates a new UUID.
* Generates a new unique ID.
*
* @returns The new UUID in text form.
* @returns The new unique ID.
*/
String Utility::NewUUID(void)
String Utility::NewUniqueID(void)
{
boost::uuids::uuid uuid = boost::uuids::random_generator()();
return boost::lexical_cast<String>(uuid);
static boost::mutex mutex;
static int next_id = 0;
/* I'd much rather use UUIDs but RHEL is way too cool to have
* a semi-recent version of boost. Yay. */
String id;
char buf[128];
if (gethostname(buf, sizeof(buf)) == 0)
id = String(buf) + "-";
id += Convert::ToString((long)Utility::GetTime()) + "-";
{
boost::mutex::scoped_lock lock(mutex);
id += Convert::ToString(next_id);
next_id++;
}
return id;
}
/**

2
lib/base/utility.h
View File

@ -53,7 +53,7 @@ public:
static void Sleep(double timeout);
static String NewUUID(void);
static String NewUniqueID(void);
static bool Glob(const String& pathSpec, const boost::function<void (const String&)>& callback);

2
lib/config/configcompilercontext.cpp
View File

@ -29,7 +29,7 @@ using namespace icinga;
ConfigCompilerContext *ConfigCompilerContext::m_Context = NULL;
ConfigCompilerContext::ConfigCompilerContext(void)
: m_Unit(Utility::NewUUID()), m_Flags(0)
: m_Unit(Utility::NewUniqueID()), m_Flags(0)
{ }
void ConfigCompilerContext::AddItem(const ConfigItem::Ptr& item)

2
lib/icinga/service-comment.cpp
View File

@ -81,7 +81,7 @@ String Service::AddComment(CommentType entryType, const String& author,
m_Comments = comments;
}
String id = Utility::NewUUID();
String id = Utility::NewUniqueID();
comments->Set(id, comment);
Touch("comments");

2
lib/icinga/service-downtime.cpp
View File

@ -96,7 +96,7 @@ String Service::AddDowntime(const String& author, const String& comment,
m_Downtimes = downtimes;
}
String id = Utility::NewUUID();
String id = Utility::NewUniqueID();
downtimes->Set(id, downtime);
Touch("downtimes");