{ NULL, 0, NULL, 0 }
};
-static struct jbus *jbus;
-static struct jbus *jbusys;
+static struct jbus *jbuses[2];
static struct afm_db *afdb;
const char error_nothing[] = "[]";
const char error_bad_request[] = "\"bad request\"";
const char error_not_found[] = "\"not found\"";
const char error_cant_start[] = "\"can't start\"";
+const char error_system[] = "\"system error\"";
static const char *getappid(struct json_object *obj)
{
static void on_runnables(struct jreq *jreq, struct json_object *obj)
{
- struct json_object *resp = afm_db_application_list(afdb);
+ struct json_object *resp;
+ INFO("method runnables called");
+ resp = afm_db_application_list(afdb);
jbus_reply_j(jreq, resp);
json_object_put(resp);
}
static void on_detail(struct jreq *jreq, struct json_object *obj)
{
- const char *appid = getappid(obj);
- struct json_object *resp = afm_db_get_application_public(afdb, appid);
+ const char *appid;
+ struct json_object *resp;
+ appid = getappid(obj);
+ INFO("method detail called for %s", appid);
+ resp = afm_db_get_application_public(afdb, appid);
reply(jreq, resp, error_not_found);
json_object_put(resp);
}
char runidstr[20];
appid = getappid(obj);
+ INFO("method start called for %s", appid);
if (appid == NULL)
jbus_reply_error_s(jreq, error_bad_request);
else {
static void on_stop(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_stop(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method stop called for %d", runid);
+ status = afm_run_stop(runid);
reply_status(jreq, status);
}
static void on_continue(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_continue(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method continue called for %d", runid);
+ status = afm_run_continue(runid);
reply_status(jreq, status);
}
static void on_terminate(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- int status = afm_run_terminate(runid);
+ int runid, status;
+ runid = getrunid(obj);
+ INFO("method terminate called for %d", runid);
+ status = afm_run_terminate(runid);
reply_status(jreq, status);
}
static void on_runners(struct jreq *jreq, struct json_object *obj)
{
- struct json_object *resp = afm_run_list();
+ struct json_object *resp;
+ INFO("method runners called");
+ resp = afm_run_list();
jbus_reply_j(jreq, resp);
json_object_put(resp);
}
static void on_state(struct jreq *jreq, struct json_object *obj)
{
- int runid = getrunid(obj);
- struct json_object *resp = afm_run_state(runid);
+ int runid;
+ struct json_object *resp;
+ runid = getrunid(obj);
+ INFO("method state called for %d", runid);
+ resp = afm_run_state(runid);
reply(jreq, resp, error_not_found);
json_object_put(resp);
}
+static void propagate(struct jreq *jreq, const char *msg, const char *method)
+{
+ char *reply;
+ INFO("method %s propagated with %s", method, msg);
+ reply = jbus_call_ss_sync(jbuses[0], method, msg);
+ if (reply) {
+ jbus_reply_s(jreq, reply);
+ free(reply);
+ }
+ else
+ jbus_reply_error_s(jreq, error_system);
+}
+
+static void on_install(struct jreq *jreq, const char *msg)
+{
+ return propagate(jreq, msg, "install");
+}
+
+static void on_uninstall(struct jreq *jreq, const char *msg)
+{
+ return propagate(jreq, msg, "uninstall");
+}
+
static void on_signal_changed(struct json_object *obj)
{
/* update the database */
afm_db_update_applications(afdb);
- /* propagate now */
- jbus_send_signal_j(jbus, "changed", obj);
+ /* re-propagate now */
+ jbus_send_signal_j(jbuses[1], "changed", obj);
}
static int daemonize()
}
/* init observers */
- jbusys = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
- if (!jbusys) {
+ jbuses[0] = create_jbus(0, AFM_SYSTEM_DBUS_PATH);
+ if (!jbuses[0]) {
ERROR("create_jbus failed for system");
return 1;
}
- if(jbus_on_signal_j(jbusys, "changed", on_signal_changed)) {
+ if(jbus_on_signal_j(jbuses[0], "changed", on_signal_changed)) {
ERROR("adding signal observer failed");
return 1;
}
/* init service */
- jbus = create_jbus(1, AFM_USER_DBUS_PATH);
- if (!jbus) {
+ jbuses[1] = create_jbus(1, AFM_USER_DBUS_PATH);
+ if (!jbuses[1]) {
ERROR("create_jbus failed");
return 1;
}
- if(jbus_add_service_j(jbus, "runnables", on_runnables)
- || jbus_add_service_j(jbus, "detail", on_detail)
- || jbus_add_service_j(jbus, "start", on_start)
- || jbus_add_service_j(jbus, "terminate", on_terminate)
- || jbus_add_service_j(jbus, "stop", on_stop)
- || jbus_add_service_j(jbus, "continue", on_continue)
- || jbus_add_service_j(jbus, "runners", on_runners)
- || jbus_add_service_j(jbus, "state", on_state)) {
+ if(jbus_add_service_j(jbuses[1], "runnables", on_runnables)
+ || jbus_add_service_j(jbuses[1], "detail", on_detail)
+ || jbus_add_service_j(jbuses[1], "start", on_start)
+ || jbus_add_service_j(jbuses[1], "terminate", on_terminate)
+ || jbus_add_service_j(jbuses[1], "stop", on_stop)
+ || jbus_add_service_j(jbuses[1], "continue", on_continue)
+ || jbus_add_service_j(jbuses[1], "runners", on_runners)
+ || jbus_add_service_j(jbuses[1], "state", on_state)
+ || jbus_add_service_s(jbuses[1], "install", on_install)
+ || jbus_add_service_s(jbuses[1], "uninstall", on_uninstall)) {
ERROR("adding services failed");
return 1;
}
/* start and run */
- if (jbus_start_serving(jbus)) {
+ if (jbus_start_serving(jbuses[1])) {
ERROR("can't start server");
return 1;
}
- while (!jbus_read_write_dispatch(jbus, -1));
+ while (jbus_read_write_dispatch_multiple(jbuses, 2, -1, 20) >= 0);
return 0;
}