chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kdbus: downgrade warning if we cannot patch kdbus attach mask to DEBUG if kdbus is...
[elogind.git]
/
src
/
timesync
/
timesyncd.c
diff --git
a/src/timesync/timesyncd.c
b/src/timesync/timesyncd.c
index 351bfd0236de4437b216ec61667e6272645aa246..f7e089fc0c5eda841ef18e42375581d403cfcbbe 100644
(file)
--- a/
src/timesync/timesyncd.c
+++ b/
src/timesync/timesyncd.c
@@
-73,7
+73,7
@@
static int load_clock_timestamp(uid_t uid, gid_t gid) {
format_timestamp(date, sizeof(date), min));
if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0)
format_timestamp(date, sizeof(date), min));
if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0)
- log_error
(
"Failed to restore system clock: %m");
+ log_error
_errno(errno,
"Failed to restore system clock: %m");
}
return 0;
}
return 0;
@@
-101,7
+101,7
@@
int main(int argc, char *argv[]) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error
("Cannot resolve user name %s: %s", user, strerror(-r)
);
+ log_error
_errno(r, "Cannot resolve user name %s: %m", user
);
goto finish;
}
goto finish;
}
@@
-117,7
+117,7
@@
int main(int argc, char *argv[]) {
r = manager_new(&m);
if (r < 0) {
r = manager_new(&m);
if (r < 0) {
- log_error
("Failed to allocate manager: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to allocate manager: %m"
);
goto finish;
}
goto finish;
}
@@
-129,10
+129,12
@@
int main(int argc, char *argv[]) {
r = manager_parse_config_file(m);
if (r < 0)
r = manager_parse_config_file(m);
if (r < 0)
- log_warning
("Failed to parse configuration file: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to parse configuration file: %m"
);
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid());
- sd_notify(false, "READY=1");
+ sd_notify(false,
+ "READY=1\n"
+ "STATUS=Daemon is running");
if (network_is_online()) {
r = manager_connect(m);
if (network_is_online()) {
r = manager_connect(m);
@@
-142,7
+144,7
@@
int main(int argc, char *argv[]) {
r = sd_event_loop(m->event);
if (r < 0) {
r = sd_event_loop(m->event);
if (r < 0) {
- log_error
("Failed to run event loop: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to run event loop: %m"
);
goto finish;
}
goto finish;
}
@@
-153,7
+155,9
@@
int main(int argc, char *argv[]) {
sd_event_get_exit_code(m->event, &r);
finish:
sd_event_get_exit_code(m->event, &r);
finish:
- sd_notify(false, "STATUS=Shutting down...");
+ sd_notify(false,
+ "STOPPING=1\n"
+ "STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}