ack
( adam stokes ) || ( adam.stokes(a)gmail.com )
On Sun, Mar 27, 2011 at 4:02 PM, Russell Bryant
<russell(a)russellbryant.net> wrote:
Signed-off-by: Russell Bryant <russell(a)russellbryant.net>
---
src/service/matahari-srv.cpp | 66 +++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/service/matahari-srv.cpp b/src/service/matahari-srv.cpp
index 38ae48b..d5e3919 100644
--- a/src/service/matahari-srv.cpp
+++ b/src/service/matahari-srv.cpp
@@ -5,12 +5,12 @@
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
- *
+ *
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -31,7 +31,7 @@
#include "qmf/org/matahariproject/Resources.h"
#include "qmf/org/matahariproject/EventResource_op.h"
-extern "C" {
+extern "C" {
#include "matahari/logging.h"
#include "matahari/services.h"
}
@@ -47,7 +47,7 @@ class SrvAgent : public MatahariAgent
gboolean invoke_services(qmf::AgentSession session, qmf::AgentEvent event,
gpointer user_data);
gboolean invoke_resources(qmf::AgentSession session, qmf::AgentEvent event,
gpointer user_data);
-
+
public:
void raiseEvent(svc_action_t *op, int service);
int setup(qmf::AgentSession session);
@@ -55,7 +55,7 @@ class SrvAgent : public MatahariAgent
};
-extern "C" {
+extern "C" {
#include <stdlib.h>
#include <string.h>
};
@@ -74,7 +74,7 @@ static void mh_resource_callback(svc_action_t *op)
agent.raiseEvent(op, 0);
}
-static GHashTable *qmf_map_to_hash(::qpid::types::Variant::Map parameters)
+static GHashTable *qmf_map_to_hash(::qpid::types::Variant::Map parameters)
{
qpid::types::Variant::Map::const_iterator qIter;
GHashTable *hash = g_hash_table_new_full(
@@ -82,7 +82,7 @@ static GHashTable *qmf_map_to_hash(::qpid::types::Variant::Map
parameters)
for (qIter=parameters.begin() ; qIter != parameters.end(); qIter++ ) {
char *key = strdup(qIter->first.c_str());
- char *value = strdup(qIter->second.asString().c_str());
+ char *value = strdup(qIter->second.asString().c_str());
g_hash_table_insert(hash, key, value);
}
@@ -98,7 +98,7 @@ main(int argc, char **argv)
mainloop_track_children(G_PRIORITY_DEFAULT);
agent.run();
}
-
+
return rc;
}
@@ -106,7 +106,7 @@ void SrvAgent::raiseEvent(svc_action_t *op, int service)
{
uint64_t timestamp = 0L;
qmf::Data event;
-
+
#ifndef MSVC
timestamp = ::time(NULL);
#endif
@@ -116,14 +116,14 @@ void SrvAgent::raiseEvent(svc_action_t *op, int service)
} else {
event = qmf::Data(_package.event_resource_op);
}
-
+
event.setProperty("name", op->rsc);
event.setProperty("action", op->action);
event.setProperty("interval", op->interval);
event.setProperty("rc", op->rc);
event.setProperty("timestamp", timestamp);
event.setProperty("sequence", 0);
-
+
if(service == 0) {
event.setProperty("rsc_type", op->agent);
@@ -138,23 +138,23 @@ int
SrvAgent::setup(qmf::AgentSession session)
{
_services = qmf::Data(_package.data_Services);
-
+
_services.setProperty("uuid", matahari_uuid());
_services.setProperty("hostname", matahari_hostname());
-
+
_services_addr = session.addData(_services);
_resources = qmf::Data(_package.data_Resources);
-
+
_resources.setProperty("uuid", matahari_uuid());
_resources.setProperty("hostname", matahari_hostname());
-
+
_resources_addr = session.addData(_resources);
return 0;
}
-gboolean
+gboolean
SrvAgent::invoke(qmf::AgentSession session, qmf::AgentEvent event, gpointer user_data)
{
if(event.getType() == qmf::AGENT_METHOD && event.hasDataAddr()) {
@@ -172,7 +172,7 @@ SrvAgent::invoke(qmf::AgentSession session, qmf::AgentEvent event,
gpointer user
}
-gboolean
+gboolean
SrvAgent::invoke_services(qmf::AgentSession session, qmf::AgentEvent event, gpointer
user_data)
{
int default_timeout_ms = 60000;
@@ -180,12 +180,12 @@ SrvAgent::invoke_services(qmf::AgentSession session,
qmf::AgentEvent event, gpoi
if(event.getType() != qmf::AGENT_METHOD) {
return TRUE;
}
-
+
if (methodName == "list") {
_qtype::Variant::List s_list;
GList *gIter = NULL;
GList *services = services_list();
-
+
for(gIter = services; gIter != NULL; gIter = gIter->next) {
s_list.push_back((const char *)gIter->data);
}
@@ -210,7 +210,7 @@ SrvAgent::invoke_services(qmf::AgentSession session, qmf::AgentEvent
event, gpoi
services_action_sync(op);
event.addReturnArgument("rc", op->rc);
services_action_free(op);
-
+
} else if (methodName == "stop") {
svc_action_t * op = services_action_create(
event.getArguments()["name"].asString().c_str(), "stop",
0, event.getArguments()["timeout"]);
@@ -220,16 +220,16 @@ SrvAgent::invoke_services(qmf::AgentSession session,
qmf::AgentEvent event, gpoi
} else if (methodName == "status") {
svc_action_t *op = services_action_create(
- event.getArguments()["name"].asString().c_str(),
"status",
+ event.getArguments()["name"].asString().c_str(),
"status",
event.getArguments()["interval"],
event.getArguments()["timeout"]);
-
+
if(event.getArguments()["interval"]) {
session.raiseException(event, MH_NOT_IMPLEMENTED);
return TRUE;
-
+
services_action_async(op, mh_service_callback);
event.addReturnArgument("rc", OCF_PENDING);
-
+
} else {
services_action_sync(op);
event.addReturnArgument("rc", op->rc);
@@ -238,14 +238,14 @@ SrvAgent::invoke_services(qmf::AgentSession session,
qmf::AgentEvent event, gpoi
} else if (methodName == "cancel") {
services_action_cancel(
- event.getArguments()["name"].asString().c_str(),
event.getArguments()["action"].asString().c_str(),
+ event.getArguments()["name"].asString().c_str(),
event.getArguments()["action"].asString().c_str(),
event.getArguments()["interval"]);
} else {
session.raiseException(event, MH_NOT_IMPLEMENTED);
return TRUE;
}
-
+
session.methodSuccess(event);
return TRUE;
}
@@ -257,7 +257,7 @@ SrvAgent::invoke_resources(qmf::AgentSession session, qmf::AgentEvent
event, gpo
if(event.getType() != qmf::AGENT_METHOD) {
return TRUE;
}
-
+
if (methodName == "list_classes") {
_qtype::Variant::List c_list;
c_list.push_back("ocf");
@@ -268,7 +268,7 @@ SrvAgent::invoke_resources(qmf::AgentSession session, qmf::AgentEvent
event, gpo
GList *gIter = NULL;
GList *providers = resources_list_ocf_providers();
_qtype::Variant::List p_list;
-
+
for(gIter = providers; gIter != NULL; gIter = gIter->next) {
p_list.push_back((const char *)gIter->data);
}
@@ -278,7 +278,7 @@ SrvAgent::invoke_resources(qmf::AgentSession session, qmf::AgentEvent
event, gpo
GList *gIter = NULL;
GList *agents =
resources_list_ocf_agents(event.getArguments()["provider"].asString().c_str());
_qtype::Variant::List t_list;
-
+
for(gIter = agents; gIter != NULL; gIter = gIter->next) {
t_list.push_back((const char *)gIter->data);
}
@@ -306,7 +306,7 @@ SrvAgent::invoke_resources(qmf::AgentSession session, qmf::AgentEvent
event, gpo
GHashTable *params =
qmf_map_to_hash(event.getArguments()["parameters"].asMap());
svc_action_t *op = resources_action_create(
event.getArguments()["name"].asString().c_str(),
event.getArguments()["provider"].asString().c_str(),
- event.getArguments()["type"].asString().c_str(),
"monitor", event.getArguments()["interval"],
+ event.getArguments()["type"].asString().c_str(),
"monitor", event.getArguments()["interval"],
event.getArguments()["timeout"], params);
if(op->interval) {
@@ -324,10 +324,10 @@ SrvAgent::invoke_resources(qmf::AgentSession session,
qmf::AgentEvent event, gpo
} else if (methodName == "invoke") {
GHashTable *params =
qmf_map_to_hash(event.getArguments()["parameters"].asMap());
svc_action_t *op = resources_action_create(
- event.getArguments()["name"].asString().c_str(),
event.getArguments()["provider"].asString().c_str(),
+ event.getArguments()["name"].asString().c_str(),
event.getArguments()["provider"].asString().c_str(),
event.getArguments()["type"].asString().c_str(),
event.getArguments()["action"].asString().c_str(),
event.getArguments()["interval"],
event.getArguments()["timeout"], params);
-
+
if(op->interval) {
session.raiseException(event, MH_NOT_IMPLEMENTED);
return TRUE;
@@ -349,7 +349,7 @@ SrvAgent::invoke_resources(qmf::AgentSession session, qmf::AgentEvent
event, gpo
session.raiseException(event, MH_NOT_IMPLEMENTED);
return TRUE;
}
-
+
session.methodSuccess(event);
return TRUE;
}
--
1.7.4
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari