chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network: link - simplify code a bit and remove some debug logging
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index 822c7ccfee43d3231db758374f6528fbed29ee22..78f4f3dfd8ec3c46fd9cd05379fc7db5a5c15d1d 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-810,7
+810,7
@@
void manager_free(Manager *m) {
free(m->switch_root);
free(m->switch_root_init);
free(m->switch_root);
free(m->switch_root_init);
- for (i = 0; i <
RLIMIT_NLIMITS
; i++)
+ for (i = 0; i <
_RLIMIT_MAX
; i++)
free(m->rlimit[i]);
assert(hashmap_isempty(m->units_requiring_mounts_for));
free(m->rlimit[i]);
assert(hashmap_isempty(m->units_requiring_mounts_for));
@@
-1621,6
+1621,11
@@
static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
break;
}
break;
}
+ if (fflush(f)) {
+ log_warning("Failed to flush status stream");
+ break;
+ }
+
log_dump(LOG_INFO, dump);
break;
}
log_dump(LOG_INFO, dump);
break;
}
@@
-2657,7
+2662,7
@@
void manager_run_generators(Manager *m) {
argv[4] = NULL;
RUN_WITH_UMASK(0022)
argv[4] = NULL;
RUN_WITH_UMASK(0022)
- execute_directory(generator_path, d, (char**) argv);
+ execute_directory(generator_path, d,
DEFAULT_TIMEOUT_USEC,
(char**) argv);
finish:
trim_generator_dir(m, &m->generator_unit_path);
finish:
trim_generator_dir(m, &m->generator_unit_path);
@@
-2728,7
+2733,7
@@
int manager_set_default_rlimits(Manager *m, struct rlimit **default_rlimit) {
assert(m);
assert(m);
- for (i = 0; i <
RLIMIT_NLIMITS
; i++) {
+ for (i = 0; i <
_RLIMIT_MAX
; i++) {
if (!default_rlimit[i])
continue;
if (!default_rlimit[i])
continue;