ACK for the parts that don't belong with patch 1
On Mon, Nov 1, 2010 at 2:21 PM, Adam Stokes <astokes(a)fedoraproject.org> wrote:
---
src/matahari-host.cpp | 5 +++--
src/matahari-net.cpp | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/matahari-host.cpp b/src/matahari-host.cpp
index 0b3b5c6..063109b 100644
--- a/src/matahari-host.cpp
+++ b/src/matahari-host.cpp
@@ -44,12 +44,12 @@
#include <qpid/client/ConnectionSettings.h>
#include "qmf/hostagent.h"
-#include "qmf/com/redhat/matahari/host/Package.h"
+#include "qmf/com/redhat/matahari/Package.h"
using namespace qpid::management;
using namespace qpid::client;
using namespace std;
-namespace _qmf = qmf::com::redhat::matahari::host;
+namespace _qmf = qmf::com::redhat::matahari;
// Global Variables
ManagementAgent::Singleton* singleton;
@@ -197,6 +197,7 @@ main(int argc, char **argv)
settings.mechanism = "GSSAPI";
}
+ agent->setName("redhat.com", "matahari");
agent->init(settings, 5, false, ".magentdata");
// Get the info and post it to the broker
diff --git a/src/matahari-net.cpp b/src/matahari-net.cpp
index dede71c..0f37848 100644
--- a/src/matahari-net.cpp
+++ b/src/matahari-net.cpp
@@ -36,16 +36,17 @@
#include <signal.h>
#include <cstdlib>
+#include <qpid/sys/Time.h>
#include <qpid/agent/ManagementAgent.h>
#include <qpid/client/ConnectionSettings.h>
#include "qmf/netagent.h"
-#include "qmf/com/redhat/matahari/net/Package.h"
+#include "qmf/com/redhat/matahari/Package.h"
using namespace qpid::management;
using namespace qpid::client;
using namespace std;
-namespace _qmf = qmf::com::redhat::matahari::net;
+namespace _qmf = qmf::com::redhat::matahari;
// Global Variables
ManagementAgent::Singleton* singleton;
@@ -192,6 +193,7 @@ main(int argc, char **argv)
settings.mechanism = "GSSAPI";
}
+ agent->setName("redhat.com", "matahari");
agent->init(settings, 5, false, ".magentdata");
/* Do any setup required by our agent */
@@ -208,7 +210,7 @@ main(int argc, char **argv)
NetAgent mh(agent);
while (true) {
- qpid::sys::sleep(1);
+ ::sleep(1);
}
}
--
1.7.2.3
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari