diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-06-27 15:54:07 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-06-27 15:54:07 +0200 |
| commit | c5f9125c75bd2aa7db9dfad6e2dc178fff2d2f73 (patch) | |
| tree | bb0749cbeee69faadf0fc1115954cd07f775531a /src/afm-system-daemon.c | |
| parent | 31943af2e46375265bb865e20a6e50f365d2a6dd (diff) | |
Moves handling of reloads
The new version ensures that the daemons are responsibles
of reloading the units. This is no more done by default.
Change-Id: I9ff33a628dfc05e429dbc7bf127d641691f2a3b9
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afm-system-daemon.c')
| -rw-r--r-- | src/afm-system-daemon.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/afm-system-daemon.c b/src/afm-system-daemon.c index 969bfaa..49749bc 100644 --- a/src/afm-system-daemon.c +++ b/src/afm-system-daemon.c @@ -29,6 +29,7 @@ #include "verbose.h" #include "utils-jbus.h" #include "utils-json.h" +#include "utils-systemd.h" #include "afm.h" #include "afm-db.h" #include "wgt-info.h" @@ -68,11 +69,21 @@ const char error_bad_request[] = "\"bad request\""; const char error_not_found[] = "\"not found\""; const char error_cant_start[] = "\"can't start\""; +static void do_reloads() +{ +#ifndef LEGACY_MODE_WITHOUT_SYSTEMD + /* enforce daemon reload */ + systemd_daemon_reload(0); + systemd_unit_restart_name(0, "sockets.target"); +#endif +} + static void on_install(struct sd_bus_message *smsg, struct json_object *req, void *unused) { const char *wgtfile; const char *root; int force; + int reload; struct wgt_info *ifo; struct json_object *resp; @@ -82,12 +93,14 @@ static void on_install(struct sd_bus_message *smsg, struct json_object *req, voi wgtfile = json_object_get_string(req); root = rootdir; force = 0; + reload = 1; break; case json_type_object: wgtfile = j_string_at(req, "wgt", NULL); if (wgtfile != NULL) { root = j_string_at(req, "root", rootdir); force = j_boolean_at(req, "force", 0); + reload = j_boolean_at(req, "reload", 1); break; } default: @@ -100,6 +113,10 @@ static void on_install(struct sd_bus_message *smsg, struct json_object *req, voi if (ifo == NULL) jbus_reply_error_s(smsg, "\"installation failed\""); else { + /* reload if needed */ + if (reload) + do_reloads(); + /* build the response */ resp = json_object_new_object(); if(!resp || !j_add_string(resp, "added", wgt_info_desc(ifo)->idaver)) |