Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix socket (de)activation at (de)install
[src/app-framework-main.git]
/
src
/
afm-user-daemon.c
diff --git
a/src/afm-user-daemon.c
b/src/afm-user-daemon.c
index
7c7824d
..
481013f
100644
(file)
--- a/
src/afm-user-daemon.c
+++ b/
src/afm-user-daemon.c
@@
-29,14
+29,16
@@
#include "verbose.h"
#include "utils-jbus.h"
#include "utils-json.h"
#include "verbose.h"
#include "utils-jbus.h"
#include "utils-json.h"
+#include "utils-systemd.h"
#include "afm.h"
#include "afm.h"
+#include "afm-launch-mode.h"
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
# include "afm-db.h"
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
# include "afm-db.h"
+#include "afm-run.h"
#else
# include "afm-udb.h"
#else
# include "afm-udb.h"
+#include "afm-urun.h"
#endif
#endif
-#include "afm-launch-mode.h"
-#include "afm-run.h"
/*
* name of the application
/*
* name of the application
@@
-254,7
+256,11
@@
static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
/* launch the application */
uri = NULL;
/* launch the application */
uri = NULL;
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
runid = afm_run_start(appli, mode, &uri);
runid = afm_run_start(appli, mode, &uri);
+#else
+ runid = afm_urun_start(appli);
+#endif
if (runid <= 0) {
jbus_reply_error_s(smsg, error_cant_start);
free(uri);
if (runid <= 0) {
jbus_reply_error_s(smsg, error_cant_start);
free(uri);
@@
-275,7
+281,11
@@
static void on_start(struct sd_bus_message *smsg, struct json_object *obj, void
&& j_add_string(resp, "uri", uri))
jbus_reply_j(smsg, resp);
else {
&& j_add_string(resp, "uri", uri))
jbus_reply_j(smsg, resp);
else {
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
afm_run_terminate(runid);
afm_run_terminate(runid);
+#else
+ afm_urun_terminate(runid);
+#endif
jbus_reply_error_s(smsg, error_system);
}
json_object_put(resp);
jbus_reply_error_s(smsg, error_system);
}
json_object_put(resp);
@@
-310,14
+320,22
@@
static void on_once(struct sd_bus_message *smsg, struct json_object *obj, void *
}
/* launch the application */
}
/* launch the application */
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
runid = afm_run_once(appli);
runid = afm_run_once(appli);
+#else
+ runid = afm_urun_once(appli);
+#endif
if (runid <= 0) {
jbus_reply_error_s(smsg, error_cant_start);
return;
}
/* returns the state */
if (runid <= 0) {
jbus_reply_error_s(smsg, error_cant_start);
return;
}
/* returns the state */
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
resp = afm_run_state(runid);
resp = afm_run_state(runid);
+#else
+ resp = afm_urun_state(afudb, runid);
+#endif
reply(smsg, resp, error_not_found);
json_object_put(resp);
}
reply(smsg, resp, error_not_found);
json_object_put(resp);
}
@@
-329,7
+347,11
@@
static void on_pause(struct sd_bus_message *smsg, struct json_object *obj, void
{
int runid, status;
if (onrunid(smsg, obj, "pause", &runid)) {
{
int runid, status;
if (onrunid(smsg, obj, "pause", &runid)) {
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
status = afm_run_pause(runid);
status = afm_run_pause(runid);
+#else
+ status = afm_urun_pause(runid);
+#endif
reply_status(smsg, status, error_not_found);
}
}
reply_status(smsg, status, error_not_found);
}
}
@@
-341,7
+363,11
@@
static void on_resume(struct sd_bus_message *smsg, struct json_object *obj, void
{
int runid, status;
if (onrunid(smsg, obj, "resume", &runid)) {
{
int runid, status;
if (onrunid(smsg, obj, "resume", &runid)) {
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
status = afm_run_resume(runid);
status = afm_run_resume(runid);
+#else
+ status = afm_urun_resume(runid);
+#endif
reply_status(smsg, status, error_not_found);
}
}
reply_status(smsg, status, error_not_found);
}
}
@@
-371,7
+397,11
@@
static void on_terminate(struct sd_bus_message *smsg, struct json_object *obj, v
{
int runid, status;
if (onrunid(smsg, obj, "terminate", &runid)) {
{
int runid, status;
if (onrunid(smsg, obj, "terminate", &runid)) {
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
status = afm_run_terminate(runid);
status = afm_run_terminate(runid);
+#else
+ status = afm_urun_terminate(runid);
+#endif
reply_status(smsg, status, error_not_found);
}
}
reply_status(smsg, status, error_not_found);
}
}
@@
-383,7
+413,11
@@
static void on_runners(struct sd_bus_message *smsg, struct json_object *obj, voi
{
struct json_object *resp;
INFO("method runners called");
{
struct json_object *resp;
INFO("method runners called");
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
resp = afm_run_list();
resp = afm_run_list();
+#else
+ resp = afm_urun_list(afudb);
+#endif
jbus_reply_j(smsg, resp);
json_object_put(resp);
}
jbus_reply_j(smsg, resp);
json_object_put(resp);
}
@@
-396,7
+430,11
@@
static void on_state(struct sd_bus_message *smsg, struct json_object *obj, void
int runid;
struct json_object *resp;
if (onrunid(smsg, obj, "state", &runid)) {
int runid;
struct json_object *resp;
if (onrunid(smsg, obj, "state", &runid)) {
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
resp = afm_run_state(runid);
resp = afm_run_state(runid);
+#else
+ resp = afm_urun_state(afudb, runid);
+#endif
reply(smsg, resp, error_not_found);
json_object_put(resp);
}
reply(smsg, resp, error_not_found);
json_object_put(resp);
}
@@
-450,6
+488,10
@@
static void on_uninstall(struct sd_bus_message *smsg, const char *msg, void *unu
*/
static void on_signal_changed(struct json_object *obj, void *unused)
{
*/
static void on_signal_changed(struct json_object *obj, void *unused)
{
+ /* enforce daemon reload */
+ systemd_daemon_reload(1);
+ systemd_unit_restart_name(1, "sockets.target");
+
/* update the database */
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
afm_db_update_applications(afdb);
/* update the database */
#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
afm_db_update_applications(afdb);
@@
-578,6
+620,7
@@
int main(int ac, char **av)
/* init random generator */
srandom((unsigned int)time(NULL));
/* init random generator */
srandom((unsigned int)time(NULL));
+#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
/* init runners */
if (afm_run_init()) {
ERROR("afm_run_init failed");
/* init runners */
if (afm_run_init()) {
ERROR("afm_run_init failed");
@@
-585,7
+628,6
@@
int main(int ac, char **av)
}
/* init framework */
}
/* init framework */
-#ifdef LEGACY_MODE_WITHOUT_SYSTEMD
afdb = afm_db_create();
if (!afdb) {
ERROR("afm_db_create failed");
afdb = afm_db_create();
if (!afdb) {
ERROR("afm_db_create failed");
@@
-621,6
+663,7
@@
int main(int ac, char **av)
return 1;
}
#else
return 1;
}
#else
+ /* init database */
afudb = afm_udb_create(0, 1, "afm-appli-");
if (!afudb) {
ERROR("afm_udb_create failed");
afudb = afm_udb_create(0, 1, "afm-appli-");
if (!afudb) {
ERROR("afm_udb_create failed");
@@
-717,17
+760,3
@@
int main(int ac, char **av)
return 0;
}
return 0;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-